1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
From 7cf644e75d41bb4ba6667a6ec81befe22b9dd254 Mon Sep 17 00:00:00 2001
From: adam-urbanczyk <13981538+adam-urbanczyk@users.noreply.github.com>
Date: Mon, 14 Jul 2025 15:43:31 +0200
Subject: [PATCH] 7.9 related fixes
---
cadquery/occ_impl/shapes.py | 38 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/cadquery/occ_impl/shapes.py b/cadquery/occ_impl/shapes.py
index 5e4e8b22b..53d9731d9 100644
--- a/cadquery/occ_impl/shapes.py
+++ b/cadquery/occ_impl/shapes.py
@@ -356,14 +356,14 @@
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_COMPSOLID: TopoDS.CompSolid_s,
- ta.TopAbs_COMPOUND: TopoDS.Compound_s,
+ ta.TopAbs_VERTEX: TopoDS.Vertex,
+ ta.TopAbs_EDGE: TopoDS.Edge,
+ ta.TopAbs_WIRE: TopoDS.Wire,
+ ta.TopAbs_FACE: TopoDS.Face,
+ ta.TopAbs_SHELL: TopoDS.Shell,
+ ta.TopAbs_SOLID: TopoDS.Solid,
+ ta.TopAbs_COMPSOLID: TopoDS.CompSolid,
+ ta.TopAbs_COMPOUND: TopoDS.Compound,
}
geom_LUT = {
@@ -893,7 +893,7 @@ def Edges(self) -> List["Edge"]:
return [
Edge(i)
for i in self._entities("Edge")
- if not BRep_Tool.Degenerated_s(TopoDS.Edge_s(i))
+ if not BRep_Tool.Degenerated_s(TopoDS.Edge(i))
]
def Compounds(self) -> List["Compound"]:
@@ -2898,8 +2898,8 @@ def stitch(self, other: "Wire") -> "Wire":
"""Attempt to stitch wires"""
wire_builder = BRepBuilderAPI_MakeWire()
- wire_builder.Add(TopoDS.Wire_s(self.wrapped))
- wire_builder.Add(TopoDS.Wire_s(other.wrapped))
+ wire_builder.Add(TopoDS.Wire(self.wrapped))
+ wire_builder.Add(TopoDS.Wire(other.wrapped))
wire_builder.Build()
return self.__class__(wire_builder.Wire())
@@ -3394,7 +3394,7 @@ def makeFromWires(cls, outerWire: Wire, innerWires: List[Wire] = []) -> "Face":
# fix outer wire
sf_s = ShapeFix_Shape(outerWire.wrapped)
sf_s.Perform()
- wo = TopoDS.Wire_s(sf_s.Shape())
+ wo = TopoDS.Wire(sf_s.Shape())
face_builder = BRepBuilderAPI_MakeFace(wo, True)
@@ -3485,9 +3485,7 @@ def chamfer2D(self, d: float, vertices: Iterable[Vertex]) -> "Face":
e1, e2 = edges
- chamfer_builder.AddChamfer(
- TopoDS.Edge_s(e1.wrapped), TopoDS.Edge_s(e2.wrapped), d, d
- )
+ chamfer_builder.AddChamfer(e1.wrapped, e2.wrapped, d, d)
chamfer_builder.Build()
@@ -3608,7 +3606,7 @@ def _(self, outer: Wire, *inner: Wire) -> Self:
bldr = BRepBuilderAPI_MakeFace(self._geomAdaptor(), outer.wrapped)
for w in inner:
- bldr.Add(TopoDS.Wire_s(w.wrapped))
+ bldr.Add(TopoDS.Wire(w.wrapped))
return self.__class__(bldr.Face()).fix()
@@ -3675,9 +3673,7 @@ def addHole(self, *inner: Wire | Edge) -> Self:
bldr = BRepBuilderAPI_MakeFace(self.wrapped)
for w in inner:
- bldr.Add(
- TopoDS.Wire_s(w.wrapped if isinstance(w, Wire) else wire(w).wrapped)
- )
+ bldr.Add(TopoDS.Wire(w.wrapped if isinstance(w, Wire) else wire(w).wrapped))
return self.__class__(bldr.Face()).fix()
@@ -3759,7 +3755,7 @@ def chamfer(
for e in nativeEdges:
face = edge_face_map.FindFromKey(e).First()
chamfer_builder.Add(
- d1, d2, e, TopoDS.Face_s(face)
+ d1, d2, e, TopoDS.Face(face)
) # NB: edge_face_map return a generic TopoDS_Shape
return self.__class__(chamfer_builder.Shape())
@@ -6126,7 +6122,7 @@ def cap(
for e in _get_edges(s):
f = _get_one(e.ancestors(ctx, "Face"), "Face")
- builder.Add(e.wrapped, f.wrapped, GeomAbs_G2, True)
+ builder.Add(e.wrapped, f.wrapped, GeomAbs_Shape.GeomAbs_G1, True)
for c in constraints:
if isinstance(c, Shape):
|