Skip to content

Commit 72ddb1f

Browse files
fix: Allow duplicate sub-assemblies
1 parent 2e05819 commit 72ddb1f

File tree

4 files changed

+3448
-9
lines changed

4 files changed

+3448
-9
lines changed

box.brep

Lines changed: 282 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,282 @@
1+
DBRep_DrawableShape
2+
3+
CASCADE Topology V3, (c) Open Cascade
4+
Locations 0
5+
Curve2ds 24
6+
1 0 0 1 0
7+
1 0 0 1 0
8+
1 1 0 0 -1
9+
1 0 0 0 1
10+
1 0 -1 1 0
11+
1 0 0 1 0
12+
1 0 0 0 -1
13+
1 0 0 0 1
14+
1 0 0 1 0
15+
1 0 1 1 0
16+
1 1 0 0 -1
17+
1 1 0 0 1
18+
1 0 -1 1 0
19+
1 0 1 1 0
20+
1 0 0 0 -1
21+
1 1 0 0 1
22+
1 0 0 0 1
23+
1 0 0 1 0
24+
1 1 0 0 1
25+
1 0 0 1 0
26+
1 0 0 0 1
27+
1 0 1 1 0
28+
1 1 0 0 1
29+
1 0 1 1 0
30+
Curves 12
31+
1 -0.5 -0.5 0 0 0 1
32+
1 -0.5 -0.5 1 -0 1 0
33+
1 -0.5 0.5 0 0 0 1
34+
1 -0.5 -0.5 0 -0 1 0
35+
1 0.5 -0.5 0 0 0 1
36+
1 0.5 -0.5 1 -0 1 0
37+
1 0.5 0.5 0 0 0 1
38+
1 0.5 -0.5 0 -0 1 0
39+
1 -0.5 -0.5 0 1 0 -0
40+
1 -0.5 -0.5 1 1 0 -0
41+
1 -0.5 0.5 0 1 0 -0
42+
1 -0.5 0.5 1 1 0 -0
43+
Polygon3D 0
44+
PolygonOnTriangulations 0
45+
Surfaces 6
46+
1 -0.5 -0.5 0 1 0 -0 0 0 1 0 -1 0
47+
1 -0.5 -0.5 0 -0 1 0 0 0 1 1 0 -0
48+
1 -0.5 -0.5 1 0 0 1 1 0 -0 -0 1 0
49+
1 -0.5 0.5 0 -0 1 0 0 0 1 1 0 -0
50+
1 -0.5 -0.5 0 0 0 1 1 0 -0 -0 1 0
51+
1 0.5 -0.5 0 1 0 -0 0 0 1 0 -1 0
52+
Triangulations 0
53+
54+
TShapes 34
55+
Ve
56+
1e-07
57+
-0.5 -0.5 1
58+
0 0
59+
60+
0101101
61+
*
62+
Ve
63+
1e-07
64+
-0.5 -0.5 0
65+
0 0
66+
67+
0101101
68+
*
69+
Ed
70+
1e-07 1 1 0
71+
1 1 0 0 1
72+
2 1 1 0 0 1
73+
2 2 2 0 0 1
74+
0
75+
76+
0101000
77+
-34 0 +33 0 *
78+
Ve
79+
1e-07
80+
-0.5 0.5 1
81+
0 0
82+
83+
0101101
84+
*
85+
Ed
86+
1e-07 1 1 0
87+
1 2 0 0 1
88+
2 3 1 0 0 1
89+
2 4 3 0 0 1
90+
0
91+
92+
0101000
93+
-31 0 +34 0 *
94+
Ve
95+
1e-07
96+
-0.5 0.5 0
97+
0 0
98+
99+
0101101
100+
*
101+
Ed
102+
1e-07 1 1 0
103+
1 3 0 0 1
104+
2 5 1 0 0 1
105+
2 6 4 0 0 1
106+
0
107+
108+
0101000
109+
-31 0 +29 0 *
110+
Ed
111+
1e-07 1 1 0
112+
1 4 0 0 1
113+
2 7 1 0 0 1
114+
2 8 5 0 0 1
115+
0
116+
117+
0101000
118+
-29 0 +33 0 *
119+
Wi
120+
121+
0101100
122+
-32 0 -30 0 +28 0 +27 0 *
123+
Fa
124+
0 1e-07 1 0
125+
126+
0111000
127+
+26 0 *
128+
Ve
129+
1e-07
130+
0.5 -0.5 1
131+
0 0
132+
133+
0101101
134+
*
135+
Ve
136+
1e-07
137+
0.5 -0.5 0
138+
0 0
139+
140+
0101101
141+
*
142+
Ed
143+
1e-07 1 1 0
144+
1 5 0 0 1
145+
2 9 6 0 0 1
146+
2 10 2 0 0 1
147+
0
148+
149+
0101000
150+
-24 0 +23 0 *
151+
Ve
152+
1e-07
153+
0.5 0.5 1
154+
0 0
155+
156+
0101101
157+
*
158+
Ed
159+
1e-07 1 1 0
160+
1 6 0 0 1
161+
2 11 6 0 0 1
162+
2 12 3 0 0 1
163+
0
164+
165+
0101000
166+
-21 0 +24 0 *
167+
Ve
168+
1e-07
169+
0.5 0.5 0
170+
0 0
171+
172+
0101101
173+
*
174+
Ed
175+
1e-07 1 1 0
176+
1 7 0 0 1
177+
2 13 6 0 0 1
178+
2 14 4 0 0 1
179+
0
180+
181+
0101000
182+
-21 0 +19 0 *
183+
Ed
184+
1e-07 1 1 0
185+
1 8 0 0 1
186+
2 15 6 0 0 1
187+
2 16 5 0 0 1
188+
0
189+
190+
0101000
191+
-19 0 +23 0 *
192+
Wi
193+
194+
0101100
195+
-22 0 -20 0 +18 0 +17 0 *
196+
Fa
197+
0 1e-07 6 0
198+
199+
0111000
200+
+16 0 *
201+
Ed
202+
1e-07 1 1 0
203+
1 9 0 0 1
204+
2 17 2 0 0 1
205+
2 18 5 0 0 1
206+
0
207+
208+
0101000
209+
-23 0 +33 0 *
210+
Ed
211+
1e-07 1 1 0
212+
1 10 0 0 1
213+
2 19 2 0 0 1
214+
2 20 3 0 0 1
215+
0
216+
217+
0101000
218+
-24 0 +34 0 *
219+
Wi
220+
221+
0101100
222+
-14 0 -22 0 +13 0 +32 0 *
223+
Fa
224+
0 1e-07 2 0
225+
226+
0111000
227+
+12 0 *
228+
Ed
229+
1e-07 1 1 0
230+
1 11 0 0 1
231+
2 21 4 0 0 1
232+
2 22 5 0 0 1
233+
0
234+
235+
0101000
236+
-19 0 +29 0 *
237+
Ed
238+
1e-07 1 1 0
239+
1 12 0 0 1
240+
2 23 4 0 0 1
241+
2 24 3 0 0 1
242+
0
243+
244+
0101000
245+
-21 0 +31 0 *
246+
Wi
247+
248+
0101100
249+
-10 0 -18 0 +9 0 +28 0 *
250+
Fa
251+
0 1e-07 4 0
252+
253+
0111000
254+
+8 0 *
255+
Wi
256+
257+
0101100
258+
-27 0 -10 0 +17 0 +14 0 *
259+
Fa
260+
0 1e-07 5 0
261+
262+
0111000
263+
+6 0 *
264+
Wi
265+
266+
0101100
267+
-30 0 -9 0 +20 0 +13 0 *
268+
Fa
269+
0 1e-07 3 0
270+
271+
0111000
272+
+4 0 *
273+
Sh
274+
275+
0101100
276+
-25 0 +15 0 -11 0 +7 0 -5 0 +3 0 *
277+
So
278+
279+
1100000
280+
+2 0 *
281+
282+
+1 0

cadquery/assembly.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,8 @@ def add(self, arg, **kwargs):
244244
# enforce unique names
245245
name = kwargs["name"] if kwargs.get("name") else arg.name
246246
if name in self.objects:
247-
raise ValueError(
248-
f"Unique name is required. {name} is already in the assembly"
249-
)
247+
# Add a incremented number to the name
248+
name = f"{name}_{len(self.objects)}"
250249

251250
subassy = arg._copy()
252251

0 commit comments

Comments
 (0)