Skip to content

Commit 55743a0

Browse files
committed
fix(Model): avoid warnings when transfering Collections
1 parent 1aaa70f commit 55743a0

File tree

1 file changed

+41
-12
lines changed

1 file changed

+41
-12
lines changed

src/geode/model/representation/core/detail/transfer_collections.cpp

Lines changed: 41 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,13 @@ namespace
8585
for( const auto& corner_out_id :
8686
corners_mapping.in2out( corner_in_collection.id() ) )
8787
{
88-
new_model_builder.add_corner_in_corner_collection(
89-
new_model.corner( corner_out_id ), new_collection );
88+
if( !new_model.is_corner_collection_item(
89+
new_model.corner( corner_out_id ),
90+
new_collection ) )
91+
{
92+
new_model_builder.add_corner_in_corner_collection(
93+
new_model.corner( corner_out_id ), new_collection );
94+
}
9095
}
9196
}
9297
}
@@ -137,8 +142,12 @@ namespace
137142
for( const auto& line_out_id :
138143
lines_mapping.in2out( line_in_collection.id() ) )
139144
{
140-
new_model_builder.add_line_in_line_collection(
141-
new_model.line( line_out_id ), new_collection );
145+
if( !new_model.is_line_collection_item(
146+
new_model.line( line_out_id ), new_collection ) )
147+
{
148+
new_model_builder.add_line_in_line_collection(
149+
new_model.line( line_out_id ), new_collection );
150+
}
142151
}
143152
}
144153
}
@@ -190,8 +199,14 @@ namespace
190199
for( const auto& surface_out_id :
191200
surfaces_mapping.in2out( surface_in_collection.id() ) )
192201
{
193-
new_model_builder.add_surface_in_surface_collection(
194-
new_model.surface( surface_out_id ), new_collection );
202+
if( !new_model.is_surface_collection_item(
203+
new_model.surface( surface_out_id ),
204+
new_collection ) )
205+
{
206+
new_model_builder.add_surface_in_surface_collection(
207+
new_model.surface( surface_out_id ),
208+
new_collection );
209+
}
195210
}
196211
}
197212
}
@@ -242,8 +257,12 @@ namespace
242257
for( const auto& block_out_id :
243258
blocks_mapping.in2out( block_in_collection.id() ) )
244259
{
245-
new_model_builder.add_block_in_block_collection(
246-
new_model.block( block_out_id ), new_collection );
260+
if( !new_model.is_block_collection_item(
261+
new_model.block( block_out_id ), new_collection ) )
262+
{
263+
new_model_builder.add_block_in_block_collection(
264+
new_model.block( block_out_id ), new_collection );
265+
}
247266
}
248267
}
249268
}
@@ -294,8 +313,14 @@ namespace
294313
for( const auto& surface_out_id :
295314
surfaces_mapping.in2out( surface_in_collection.id() ) )
296315
{
297-
new_model_builder.add_surface_in_model_boundary(
298-
new_model.surface( surface_out_id ), new_collection );
316+
if( !new_model.is_model_boundary_item(
317+
new_model.surface( surface_out_id ),
318+
new_collection ) )
319+
{
320+
new_model_builder.add_surface_in_model_boundary(
321+
new_model.surface( surface_out_id ),
322+
new_collection );
323+
}
299324
}
300325
}
301326
}
@@ -346,8 +371,12 @@ namespace
346371
for( const auto& line_out_id :
347372
lines_mapping.in2out( line_in_collection.id() ) )
348373
{
349-
new_model_builder.add_line_in_model_boundary(
350-
new_model.line( line_out_id ), new_collection );
374+
if( !new_model.is_model_boundary_item(
375+
new_model.line( line_out_id ), new_collection ) )
376+
{
377+
new_model_builder.add_line_in_model_boundary(
378+
new_model.line( line_out_id ), new_collection );
379+
}
351380
}
352381
}
353382
}

0 commit comments

Comments
 (0)