Merge branch 'dev' of https://github.com/gumyr/build123d into dev

gumyr · Sep 25, 2024 · e901b63 · e901b63
2 parents 14805a5 + ab192ee
commit e901b63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/docs/general_examples_algebra.py b/docs/general_examples_algebra.py
@@ -386,7 +386,7 @@
 
 l1 = Polyline(pts)
 l2 = Line(l1 @ 1, l1 @ 0)
-sk23 = make_face(l1, l2)
+sk23 = make_face([l1, l2])
 
 sk23 += Pos(0, 35) * Circle(25)
 sk23 = Plane.XZ * split(sk23, bisect_by=Plane.ZY)

diff --git a/docs/tutorial_joints.py b/docs/tutorial_joints.py
@@ -239,11 +239,11 @@ def write_svg(part, filename: str, view_port_origin=(-100, 100, 150)):
 #
 # SVG Export options
 write_svg(
-    Compound.make_compound([box, box.joints["hinge_attachment"].symbol]),
+    Compound([box, box.joints["hinge_attachment"].symbol]),
     "tutorial_joint_box",
 )
 write_svg(
-    Compound.make_compound(
+    Compound(
         [
             hinge_inner,
             hinge_inner.joints["leaf"].symbol,
@@ -257,7 +257,7 @@ def write_svg(part, filename: str, view_port_origin=(-100, 100, 150)):
     (100, 100, -50),
 )
 write_svg(
-    Compound.make_compound(
+    Compound(
         [
             hinge_outer,
             hinge_outer.joints["leaf"].symbol,
@@ -271,17 +271,17 @@ def write_svg(part, filename: str, view_port_origin=(-100, 100, 150)):
     (100, 100, -50),
 )
 write_svg(
-    Compound.make_compound([box, hinge_outer]),
+    Compound([box, hinge_outer]),
     "tutorial_joint_box_outer",
     (-100, -100, 50),
 )
 write_svg(
-    Compound.make_compound([lid, lid.joints["hinge_attachment"].symbol]),
+    Compound([lid, lid.joints["hinge_attachment"].symbol]),
     "tutorial_joint_lid",
     (-100, 100, 150),
 )
 write_svg(
-    Compound.make_compound([m6_screw, m6_joint.symbol]),
+    Compound([m6_screw, m6_joint.symbol]),
     "tutorial_joint_m6_screw",
     (-100, 100, 150),
 )
@@ -290,23 +290,23 @@ def write_svg(part, filename: str, view_port_origin=(-100, 100, 150)):
 box.joints["hinge_attachment"].connect_to(hinge_outer.joints["leaf"])
 # [Connect Box to Outer Hinge]
 write_svg(
-    Compound.make_compound([box, hinge_outer]),
+    Compound([box, hinge_outer]),
     "tutorial_joint_box_outer",
     (-100, -100, 50),
 )
 # [Connect Hinge Leaves]
 hinge_outer.joints["hinge_axis"].connect_to(hinge_inner.joints["hinge_axis"], angle=120)
 # [Connect Hinge Leaves]
 write_svg(
-    Compound.make_compound([box, hinge_outer, hinge_inner]),
+    Compound([box, hinge_outer, hinge_inner]),
     "tutorial_joint_box_outer_inner",
     (-100, -100, 50),
 )
 # [Connect Hinge to Lid]
 hinge_inner.joints["leaf"].connect_to(lid.joints["hinge_attachment"])
 # [Connect Hinge to Lid]
 write_svg(
-    Compound.make_compound([box, hinge_outer, hinge_inner, lid]),
+    Compound([box, hinge_outer, hinge_inner, lid]),
     "tutorial_joint_box_outer_inner_lid",
     (-100, -100, 50),
 )