Skip to content

Commit

Permalink
Merge pull request #853 from jdegenstein/mypy_sketchobjs
Browse files Browse the repository at this point in the history 
objects_sketch.py -> mypy typing improvements
  • Loading branch information
@gumyr
gumyr authored Jan 9, 2025
2 parents 2d54b80 + 4669057 commit f358699
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 38 deletions.
3 changes: 3 additions & 0 deletions mypy.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
78 changes: 40 additions & 38 deletions src/build123d/objects_sketch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def __init__(
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:
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -157,7 +157,7 @@ def __init__(
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)
Expand Down Expand Up @@ -196,14 +196,14 @@ def __init__(
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)
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]
Expand Down Expand Up @@ -232,7 +232,7 @@ def __init__(
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)
Expand Down Expand Up @@ -269,7 +269,7 @@ def __init__(
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)
Expand Down Expand Up @@ -354,9 +354,9 @@ def __init__(
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)


Expand Down Expand Up @@ -510,7 +510,7 @@ def __init__(
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:
Expand All @@ -525,7 +525,7 @@ def __init__(
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()),
Expand Down Expand Up @@ -566,14 +566,14 @@ def __init__(
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),
path: Edge | Wire = None,
align: Align | tuple[Align, Align] | None = (Align.CENTER, Align.CENTER),
path: Edge | Wire | None = None,
position_on_path: float = 0.0,
rotation: float = 0,
rotation: float = 0.0,
mode: Mode = Mode.ADD,
) -> Compound:
):
context = BuildSketch._get_context(self)
validate_inputs(context, self)

Expand All @@ -594,7 +594,7 @@ def __init__(
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,
)
Expand Down Expand Up @@ -628,9 +628,9 @@ def __init__(
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)
Expand Down Expand Up @@ -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,
):
Expand All @@ -729,27 +729,29 @@ def __init__(
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
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
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)
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'
Expand Down

0 comments on commit f358699

Please sign in to comment.