Merge afdc4db into 44ae035

CadQuery · Jul 6, 2023 · 1f4ee77 · 1f4ee77
2 parents 44ae035 + afdc4db
commit 1f4ee77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/cadquery/occ_impl/assembly.py b/cadquery/occ_impl/assembly.py
@@ -326,7 +326,7 @@ def toJSON(
 
  val: Any = {}
 
- data = toString(Compound.makeCompound(assy.shapes), tolerance)
+ data = toString(shape, tolerance)
  trans, rot = loc.toTuple()
 
  val["shape"] = data

diff --git a/doc/assy.rst b/doc/assy.rst
@@ -783,14 +783,12 @@ Where:
  .add(b1, loc=cq.Location((-2, 0, 0)), name="b3", color=cq.Color("red"))
  )
 
- pnt = (0.5, 0.5, 0.5)
-
  # fix the position of b1
  assy.constrain("b1", "Fixed")
  # fix b2 center at point
- assy.constrain("b2", "FixedPoint", pnt)
+ assy.constrain("b2", "FixedPoint", (0.5, 0.5, 0.5))
  # fix b3 vertex position at point
- assy.constrain("b3@vertices@<X and <Y and <Z", "FixedPoint", pnt)
+ assy.constrain("b3@vertices@<X and <Y and <Z", "FixedPoint", (0.5, 0.5, 0.5))
 
  assy.solve()
  show_object(assy)