diff --git a/src/blenderbim/blenderbim/bim/module/geometry/operator.py b/src/blenderbim/blenderbim/bim/module/geometry/operator.py index 2582db14be..9f2db6517f 100644 --- a/src/blenderbim/blenderbim/bim/module/geometry/operator.py +++ b/src/blenderbim/blenderbim/bim/module/geometry/operator.py @@ -81,16 +81,6 @@ class AddRepresentation(bpy.types.Operator, Operator): ifc_representation_class=self.ifc_representation_class, profile_set_usage=tool.Ifc.get().by_id(self.profile_set_usage) if self.profile_set_usage else None, ) - Data.load(tool.Ifc.get(), obj.BIMObjectProperties.ifc_definition_id) - element = tool.Ifc.get_entity(obj) - if element.is_a("IfcTypeProduct"): - if tool.Ifc.get_schema() == "IFC2X3": - types = element.ObjectTypeOf - else: - types = element.Types - if types: - for element in types[0].RelatedObjects: - Data.load(tool.Ifc.get(), element.id()) class SwitchRepresentation(bpy.types.Operator, Operator): diff --git a/src/ifcopenshell-python/ifcopenshell/api/geometry/assign_representation.py b/src/ifcopenshell-python/ifcopenshell/api/geometry/assign_representation.py index 2e09ed9586..da8a31ad07 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/geometry/assign_representation.py +++ b/src/ifcopenshell-python/ifcopenshell/api/geometry/assign_representation.py @@ -1,4 +1,5 @@ import ifcopenshell.api +import ifcopenshell.util.element class Usecase: @@ -10,13 +11,16 @@ class Usecase: def execute(self): if self.settings["product"].is_a("IfcProduct"): - definition = self.settings["product"].Representation - if not definition: - definition = self.file.createIfcProductDefinitionShape() - self.settings["product"].Representation = definition - representations = list(definition.Representations) if definition.Representations else [] - representations.append(self.settings["representation"]) - definition.Representations = representations + product_type = ifcopenshell.util.element.get_type(self.settings["product"]) + if ( + product_type + and product_type.RepresentationMaps + and self.settings["representation"].RepresentationType != "MappedRepresentation" + ): + self.settings["product"] = product_type + + if self.settings["product"].is_a("IfcProduct"): + self.assign_product_representation(self.settings["product"], self.settings["representation"]) elif self.settings["product"].is_a("IfcTypeProduct"): if self.settings["product"].RepresentationMaps: maps = list(self.settings["product"].RepresentationMaps) @@ -44,9 +48,14 @@ class Usecase: mapped_representation = ifcopenshell.api.run( "geometry.map_representation", self.file, **{"representation": self.settings["representation"]} ) - ifcopenshell.api.run( - "geometry.assign_representation", - self.file, - **{"product": element, "representation": mapped_representation} - ) + self.assign_product_representation(element, mapped_representation) ifcopenshell.api.run("owner.update_owner_history", self.file, **{"element": self.settings["product"]}) + + def assign_product_representation(self, product, representation): + definition = product.Representation + if not definition: + definition = self.file.createIfcProductDefinitionShape() + product.Representation = definition + representations = list(definition.Representations) if definition.Representations else [] + representations.append(representation) + definition.Representations = representations diff --git a/src/ifcopenshell-python/ifcopenshell/api/type/map_type_representations.py b/src/ifcopenshell-python/ifcopenshell/api/type/map_type_representations.py index 6b76a29f0a..797a13b717 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/type/map_type_representations.py +++ b/src/ifcopenshell-python/ifcopenshell/api/type/map_type_representations.py @@ -20,7 +20,6 @@ class Usecase: if self.settings["related_object"].Representation: representations = self.settings["related_object"].Representation.Representations for representation in representations: - print('for each rep', representation) ifcopenshell.api.run( "geometry.unassign_representation", self.file, diff --git a/src/ifcopenshell-python/test/api/geometry/test_assign_representation.py b/src/ifcopenshell-python/test/api/geometry/test_assign_representation.py new file mode 100644 index 0000000000..2378c5a678 --- /dev/null +++ b/src/ifcopenshell-python/test/api/geometry/test_assign_representation.py @@ -0,0 +1,73 @@ +import test.bootstrap +import ifcopenshell.api + + +class TestAssignRepresentation(test.bootstrap.IFC4): + def test_assigning_to_a_product(self): + wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") + rep = self.file.createIfcShapeRepresentation() + ifcopenshell.api.run("geometry.assign_representation", self.file, product=wall, representation=rep) + assert wall.Representation.Representations == (rep,) + + def test_assigning_to_a_product_with_existing_representations(self): + wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") + rep = self.file.createIfcShapeRepresentation() + rep2 = self.file.createIfcShapeRepresentation() + ifcopenshell.api.run("geometry.assign_representation", self.file, product=wall, representation=rep) + ifcopenshell.api.run("geometry.assign_representation", self.file, product=wall, representation=rep2) + assert wall.Representation.Representations == (rep, rep2) + + def test_assigning_to_a_type_product(self): + walltype = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWallType") + rep = self.file.createIfcShapeRepresentation() + rep2 = self.file.createIfcShapeRepresentation() + ifcopenshell.api.run("geometry.assign_representation", self.file, product=walltype, representation=rep) + ifcopenshell.api.run("geometry.assign_representation", self.file, product=walltype, representation=rep2) + assert walltype.RepresentationMaps[0].MappedRepresentation == rep + assert walltype.RepresentationMaps[1].MappedRepresentation == rep2 + + def test_assigning_to_a_type_will_map_representations_to_instances(self): + wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") + walltype = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWallType") + ifcopenshell.api.run("type.assign_type", self.file, related_object=wall, relating_type=walltype) + context = self.file.createIfcGeometricRepresentationContext() + rep = self.file.createIfcShapeRepresentation(ContextOfItems=context) + rep2 = self.file.createIfcShapeRepresentation(ContextOfItems=context) + ifcopenshell.api.run("geometry.assign_representation", self.file, product=walltype, representation=rep) + ifcopenshell.api.run("geometry.assign_representation", self.file, product=walltype, representation=rep2) + assert wall.Representation.Representations[0].RepresentationType == "MappedRepresentation" + assert wall.Representation.Representations[0].Items[0].MappingSource.MappedRepresentation == rep + assert wall.Representation.Representations[0].Items[0].MappingSource == walltype.RepresentationMaps[0] + assert wall.Representation.Representations[1].RepresentationType == "MappedRepresentation" + assert wall.Representation.Representations[1].Items[0].MappingSource.MappedRepresentation == rep2 + assert wall.Representation.Representations[1].Items[0].MappingSource == walltype.RepresentationMaps[1] + + def test_assigning_to_an_instance_with_a_geometric_type_adds_it_to_both_the_instance_and_type(self): + context = self.file.createIfcGeometricRepresentationContext() + rep = self.file.createIfcShapeRepresentation(ContextOfItems=context) + rep2 = self.file.createIfcShapeRepresentation(ContextOfItems=context) + + walltype = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWallType") + ifcopenshell.api.run("geometry.assign_representation", self.file, product=walltype, representation=rep) + + wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") + ifcopenshell.api.run("type.assign_type", self.file, related_object=wall, relating_type=walltype) + + ifcopenshell.api.run("geometry.assign_representation", self.file, product=wall, representation=rep2) + assert wall.Representation.Representations[0].RepresentationType == "MappedRepresentation" + assert wall.Representation.Representations[0].Items[0].MappingSource.MappedRepresentation == rep + assert walltype.RepresentationMaps[0].MappedRepresentation == rep + assert wall.Representation.Representations[1].RepresentationType == "MappedRepresentation" + assert wall.Representation.Representations[1].Items[0].MappingSource.MappedRepresentation == rep2 + assert walltype.RepresentationMaps[1].MappedRepresentation == rep2 + + def test_assigning_to_an_instance_with_a_nongeometric_type_only_adds_it_to_the_instance(self): + context = self.file.createIfcGeometricRepresentationContext() + rep = self.file.createIfcShapeRepresentation(ContextOfItems=context) + walltype = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWallType") + wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall") + ifcopenshell.api.run("type.assign_type", self.file, related_object=wall, relating_type=walltype) + ifcopenshell.api.run("geometry.assign_representation", self.file, product=wall, representation=rep) + assert wall.Representation.Representations[0].RepresentationType != "MappedRepresentation" + assert wall.Representation.Representations[0] == rep + assert not walltype.RepresentationMaps