From 888a3277d0de6f0abec2739060c2d59fc6bbc2ca Mon Sep 17 00:00:00 2001 From: Roger Maitland Date: Sun, 26 Mar 2023 09:32:56 -0400 Subject: [PATCH] Removed fillet/chamfer target --- examples/clock_algebra.py | 4 +--- examples/din_rail_algebra.py | 4 ++-- examples/handle_algebra.py | 2 +- examples/heat_exchanger_algebra.py | 2 +- examples/intersecting_chamfers_algebra.py | 4 ++-- examples/intersecting_pipes_algebra.py | 2 +- examples/joints_algebra.py | 2 +- examples/key_cap_algebra.py | 1 - examples/pillow_block_algebra.py | 2 +- examples/playing_cards_algebra.py | 9 ++------- examples/vase_algebra.py | 4 ++-- 11 files changed, 14 insertions(+), 22 deletions(-) diff --git a/examples/clock_algebra.py b/examples/clock_algebra.py index c934dc2..f66e8d9 100644 --- a/examples/clock_algebra.py +++ b/examples/clock_algebra.py @@ -7,9 +7,7 @@ l2 = CenterArc((0, 0), clock_radius * 0.925, 0.75, 4.5) l3 = Line(l1 @ 0, l2 @ 0) l4 = Line(l1 @ 1, l2 @ 1) minute_indicator = make_face(l1, l3, l2, l4) -minute_indicator = fillet( - *minute_indicator.vertices(), radius=clock_radius * 0.01, target=minute_indicator -) +minute_indicator = fillet(*minute_indicator.vertices(), radius=clock_radius * 0.01) clock_face = Circle(clock_radius) clock_face -= [loc * minute_indicator for loc in PolarLocations(0, 60)] diff --git a/examples/din_rail_algebra.py b/examples/din_rail_algebra.py index fa8bea3..e9a9b72 100644 --- a/examples/din_rail_algebra.py +++ b/examples/din_rail_algebra.py @@ -24,14 +24,14 @@ inside_vertices = ( ) ) -din = fillet(*inside_vertices, radius=fillet_radius, target=din) +din = fillet(*inside_vertices, radius=fillet_radius) outside_vertices = filter( lambda v: (v.Y == 0.0 or v.Y == height) and -overall_width / 2 < v.X < overall_width / 2, din.vertices(), ) -din = fillet(*outside_vertices, radius=fillet_radius + thickness, target=din) +din = fillet(*outside_vertices, radius=fillet_radius + thickness) rail = extrude(din, rail_length) diff --git a/examples/handle_algebra.py b/examples/handle_algebra.py index 66f0448..3c3e3cf 100644 --- a/examples/handle_algebra.py +++ b/examples/handle_algebra.py @@ -26,7 +26,7 @@ for i in range(segment_count + 1): section = plane * Circle(1) else: section = plane * Rectangle(1.25, 3) - section = fillet(*section.vertices(), radius=0.2, target=section) + section = fillet(*section.vertices(), radius=0.2) sections += section # Create the handle by sweeping along the path diff --git a/examples/heat_exchanger_algebra.py b/examples/heat_exchanger_algebra.py index 4f3d59b..599d80c 100644 --- a/examples/heat_exchanger_algebra.py +++ b/examples/heat_exchanger_algebra.py @@ -50,7 +50,7 @@ edges = ( .group_by()[2] ) half_volume_before_fillet = heat_exchanger.volume -heat_exchanger = fillet(*edges, radius=fillet_radius, target=heat_exchanger) +heat_exchanger = fillet(*edges, radius=fillet_radius) half_volume_after_fillet = heat_exchanger.volume heat_exchanger += mirror(heat_exchanger, about=Plane.XY) diff --git a/examples/intersecting_chamfers_algebra.py b/examples/intersecting_chamfers_algebra.py index 5631688..09bf7c0 100644 --- a/examples/intersecting_chamfers_algebra.py +++ b/examples/intersecting_chamfers_algebra.py @@ -5,10 +5,10 @@ blocks += Box(1, 1, 2, align=(Align.CENTER, Align.MIN, Align.MIN)) blocks += Pos(1, -1, 0) * Box(1, 2, 1, align=(Align.CENTER, Align.MIN, Align.MIN)) bottom_edges = blocks.edges().filter_by_position(Axis.Z, 0, 1, inclusive=(True, False)) -blocks2 = chamfer(*bottom_edges, length=0.1, target=blocks) +blocks2 = chamfer(*bottom_edges, length=0.1) top_edges = blocks2.edges().filter_by_position(Axis.Z, 1, 2, inclusive=(False, True)) -blocks2 = chamfer(*top_edges, length=0.1, target=blocks2) +blocks2 = chamfer(*top_edges, length=0.1) if "show_object" in locals(): diff --git a/examples/intersecting_pipes_algebra.py b/examples/intersecting_pipes_algebra.py index e37eac9..296913a 100644 --- a/examples/intersecting_pipes_algebra.py +++ b/examples/intersecting_pipes_algebra.py @@ -10,7 +10,7 @@ for plane in [Plane(f) for f in pipes.faces()]: last = pipes.edges() pipes += extrude(pipe, amount=10) - pipes = fillet(*pipes.edges() - last, radius=0.2, target=pipes) + pipes = fillet(*pipes.edges() - last, radius=0.2) if "show_object" in locals(): show_object(pipes, name="intersecting pipes") diff --git a/examples/joints_algebra.py b/examples/joints_algebra.py index 9b34afb..a486f22 100644 --- a/examples/joints_algebra.py +++ b/examples/joints_algebra.py @@ -25,7 +25,7 @@ class JointBox(Part): # Create the object obj = extrude(Rectangle(length, width), amount=height, taper=taper) if radius != 0.0: - obj = fillet(*obj.edges(), radius=radius, target=obj) + obj = fillet(*obj.edges(), radius=radius) obj -= Rot(0, 90, 0) * Cylinder(width / 4, length) # Initialize the Part class with the new OCCT object super().__init__(obj.wrapped) diff --git a/examples/key_cap_algebra.py b/examples/key_cap_algebra.py index 11ce615..38efd10 100644 --- a/examples/key_cap_algebra.py +++ b/examples/key_cap_algebra.py @@ -13,7 +13,6 @@ key_cap -= Location((0, -3 * MM, 47 * MM), (90, 0, 0)) * Sphere(40 * MM) key_cap = fillet( *key_cap.edges().filter_by_position(Axis.Z, 0, 30 * MM, inclusive=(False, True)), radius=1 * MM, - target=key_cap, ) # Hollow out the key by subtracting a scaled version diff --git a/examples/pillow_block_algebra.py b/examples/pillow_block_algebra.py index c0d6c00..940dbec 100644 --- a/examples/pillow_block_algebra.py +++ b/examples/pillow_block_algebra.py @@ -6,7 +6,7 @@ bearing_axle_radius, bearing_radius, bearing_thickness = 4, 11, 7 # Build pillow block as an extruded sketch with counter bore holes plan = Rectangle(width, height) -plan = fillet(*plan.vertices(), radius=5, target=plan) +plan = fillet(*plan.vertices(), radius=5) pillow_block = extrude(plan, thickness) plane = Plane(pillow_block.faces().sort_by().last) diff --git a/examples/playing_cards_algebra.py b/examples/playing_cards_algebra.py index 6f066fd..27ecd10 100644 --- a/examples/playing_cards_algebra.py +++ b/examples/playing_cards_algebra.py @@ -136,9 +136,7 @@ class PlayingCard(Compound): playing_card = Rectangle(w, h, align=Align.MIN) if "show" in locals(): show(playing_card) - playing_card = fillet( - *playing_card.vertices(), radius=w / 15, target=playing_card - ) + playing_card = fillet(*playing_card.vertices(), radius=w / 15) if "show" in locals(): show(playing_card) playing_card -= Pos(w / 7, 8 * h / 9) * Text( @@ -147,10 +145,7 @@ class PlayingCard(Compound): ) if "show" in locals(): show(playing_card) - playing_card -= Pos( - w / 7, - 7 * h / 9, - ) * PlayingCard.suits[ + playing_card -= Pos(w / 7, 7 * h / 9,) * PlayingCard.suits[ suit ](height=w / 12) if "show" in locals(): diff --git a/examples/vase_algebra.py b/examples/vase_algebra.py index a7994a2..79d800e 100644 --- a/examples/vase_algebra.py +++ b/examples/vase_algebra.py @@ -22,9 +22,9 @@ vase = revolve(profile, axis=Axis.Y) vase = offset(vase, openings=vase.faces().sort_by(Axis.Y).last, amount=-1) top_edges = vase.edges().filter_by(GeomType.CIRCLE).filter_by_position(Axis.Y, 60, 62) -vase = fillet(*top_edges, radius=0.25, target=vase) +vase = fillet(*top_edges, radius=0.25) -vase = fillet(vase.edges().sort_by(Axis.Y).first, radius=0.5, target=vase) +vase = fillet(vase.edges().sort_by(Axis.Y).first, radius=0.5) if "show_object" in locals(): show_object(vase, name="vase")