From 8bcec29429842f5b0b6f0c4cc3df60c8d5e0ccd0 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Fri, 1 Oct 2021 10:10:45 +1000 Subject: [PATCH] Application data in IFC now reflects the latest IFC version tag --- .../api/context/remove_context.py | 25 +++++++-------- .../ifcopenshell/api/owner/add_application.py | 27 +++------------- .../test/api/context/test_remove_context.py | 11 ++++--- .../test/api/owner/test_add_address.py | 32 +++++++++++++++++++ .../test/api/owner/test_add_application.py | 21 ++++++++++++ 5 files changed, 76 insertions(+), 40 deletions(-) create mode 100644 src/ifcopenshell-python/test/api/owner/test_add_address.py create mode 100644 src/ifcopenshell-python/test/api/owner/test_add_application.py diff --git a/src/ifcopenshell-python/ifcopenshell/api/context/remove_context.py b/src/ifcopenshell-python/ifcopenshell/api/context/remove_context.py index 8c11a6d6de..ad2b85886d 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/context/remove_context.py +++ b/src/ifcopenshell-python/ifcopenshell/api/context/remove_context.py @@ -15,17 +15,14 @@ class Usecase: if getattr(self.settings["context"], "ParentContext", None): new = self.settings["context"].ParentContext for inverse in self.file.get_inverse(self.settings["context"]): - ifcopenshell.util.element.replace_attribute(inverse, self.settings["context"], new) - - representations_in_context = self.settings["context"].RepresentationsInContext - has_coordinate_operation = [] - if self.settings["context"].is_a("IfcGeometricRepresentationSubContext"): - has_coordinate_operation = self.settings["context"].HasCoordinateOperation - - self.file.remove(self.settings["context"]) - - for element in representations_in_context: - ifcopenshell.api.run("geometry.remove_representation", self.file, representation=element) - - for element in has_coordinate_operation: - ifcopenshell.util.element.remove_deep(self.file, element) + if inverse.is_a("IfcCoordinateOperation"): + inverse.SourceCRS = inverse.TargetCRS + ifcopenshell.util.element.remove_deep(self.file, inverse) + else: + ifcopenshell.util.element.replace_attribute(inverse, self.settings["context"], new) + self.file.remove(self.settings["context"]) + else: + representations_in_context = self.settings["context"].RepresentationsInContext + self.file.remove(self.settings["context"]) + for element in representations_in_context: + ifcopenshell.api.run("geometry.remove_representation", self.file, representation=element) diff --git a/src/ifcopenshell-python/ifcopenshell/api/owner/add_application.py b/src/ifcopenshell-python/ifcopenshell/api/owner/add_application.py index e1a9b1dd8f..5d34fc6bee 100644 --- a/src/ifcopenshell-python/ifcopenshell/api/owner/add_application.py +++ b/src/ifcopenshell-python/ifcopenshell/api/owner/add_application.py @@ -6,7 +6,7 @@ class Usecase: self.file = file self.settings = { "application_developer": None, - "version": "0.6.0", + "version": ifcopenshell.version, "application_full_name": "IfcOpenShell", "application_identifier": "IfcOpenShell", } @@ -27,11 +27,11 @@ class Usecase: ) def create_application_organisation(self): - return self.file.create_entity( + result = self.file.create_entity( "IfcOrganization", **{ "Name": "IfcOpenShell", - "Description": "IfcOpenShell is an open source (LGPL) software library that helps users and software developers to work with the IFC file format.", + "Description": "IfcOpenShell is an open source software library that helps users and software developers to work with IFC data.", "Roles": [ self.file.create_entity("IfcActorRole", **{"Role": "USERDEFINED", "UserDefinedRole": "CONTRIBUTOR"}) ], @@ -41,28 +41,11 @@ class Usecase: **{ "Purpose": "USERDEFINED", "UserDefinedPurpose": "WEBPAGE", - "Description": "The main webpage of the software collection.", "WWWHomePageURL": "https://ifcopenshell.org", }, ), - self.file.create_entity( - "IfcTelecomAddress", - **{ - "Purpose": "USERDEFINED", - "UserDefinedPurpose": "WEBPAGE", - "Description": "The BlenderBIM Add-on webpage of the software collection.", - "WWWHomePageURL": "https://blenderbim.org", - }, - ), - self.file.create_entity( - "IfcTelecomAddress", - **{ - "Purpose": "USERDEFINED", - "UserDefinedPurpose": "REPOSITORY", - "Description": "The source code repository of the software collection.", - "WWWHomePageURL": "https://github.com/IfcOpenShell/IfcOpenShell.git", - }, - ), ], }, ) + result[0] = "IfcOpenShell" + return result diff --git a/src/ifcopenshell-python/test/api/context/test_remove_context.py b/src/ifcopenshell-python/test/api/context/test_remove_context.py index 70113eb54d..c6dc29da21 100644 --- a/src/ifcopenshell-python/test/api/context/test_remove_context.py +++ b/src/ifcopenshell-python/test/api/context/test_remove_context.py @@ -20,13 +20,16 @@ class TestRemoveContext(test.bootstrap.IFC4): subcontext = self.file.createIfcGeometricRepresentationSubcontext() subcontext.ParentContext = context representation = self.file.createIfcRepresentation(ContextOfItems=subcontext) + projected_crs = self.file.createIfcProjectedCRS() + map_conversion = self.file.createIfcMapConversion(SourceCRS=subcontext, TargetCRS=projected_crs) ifcopenshell.api.run("context.remove_context", self.file, context=subcontext) assert len(self.file.by_type("IfcGeometricRepresentationSubcontext")) == 0 assert representation in self.file.get_inverse(context) + assert len(self.file.by_type("IfcMapConversion")) == 0 + assert len(self.file.by_type("IfcProjectedCRS")) == 0 def test_removing_a_context_with_references(self): - subcontext = self.file.createIfcGeometricRepresentationSubContext() - representation = self.file.createIfcRepresentation(ContextOfItems=subcontext) - map_conversion = self.file.createIfcMapConversion(SourceCRS=subcontext) - ifcopenshell.api.run("context.remove_context", self.file, context=subcontext) + context = self.file.createIfcGeometricRepresentationContext() + representation = self.file.createIfcRepresentation(ContextOfItems=context) + ifcopenshell.api.run("context.remove_context", self.file, context=context) assert len([e for e in self.file]) == 0 diff --git a/src/ifcopenshell-python/test/api/owner/test_add_address.py b/src/ifcopenshell-python/test/api/owner/test_add_address.py new file mode 100644 index 0000000000..3d51d465ea --- /dev/null +++ b/src/ifcopenshell-python/test/api/owner/test_add_address.py @@ -0,0 +1,32 @@ +import test.bootstrap +import ifcopenshell.api + + +class TestAddAddress(test.bootstrap.IFC4): + def test_adding_to_a_person(self): + person = self.file.createIfcPerson() + postal = ifcopenshell.api.run( + "owner.add_address", self.file, assigned_object=person, ifc_class="IfcPostalAddress" + ) + telecom = ifcopenshell.api.run( + "owner.add_address", self.file, assigned_object=person, ifc_class="IfcTelecomAddress" + ) + assert postal.is_a("IfcPostalAddress") + assert telecom.is_a("IfcTelecomAddress") + assert postal.Purpose == telecom.Purpose == "OFFICE" + assert postal in person.Addresses + assert telecom in person.Addresses + + def test_adding_to_a_organisation(self): + organisation = self.file.createIfcOrganization() + postal = ifcopenshell.api.run( + "owner.add_address", self.file, assigned_object=organisation, ifc_class="IfcPostalAddress" + ) + telecom = ifcopenshell.api.run( + "owner.add_address", self.file, assigned_object=organisation, ifc_class="IfcTelecomAddress" + ) + assert postal.is_a("IfcPostalAddress") + assert telecom.is_a("IfcTelecomAddress") + assert postal.Purpose == telecom.Purpose == "OFFICE" + assert postal in organisation.Addresses + assert telecom in organisation.Addresses diff --git a/src/ifcopenshell-python/test/api/owner/test_add_application.py b/src/ifcopenshell-python/test/api/owner/test_add_application.py new file mode 100644 index 0000000000..f712c894be --- /dev/null +++ b/src/ifcopenshell-python/test/api/owner/test_add_application.py @@ -0,0 +1,21 @@ +import test.bootstrap +import ifcopenshell.api + + +class TestAddApplication(test.bootstrap.IFC4): + def test_adding_the_ifcopenshell_application(self): + application = ifcopenshell.api.run("owner.add_application", self.file) + developer = application.ApplicationDeveloper + assert application.Version == ifcopenshell.version + assert application.ApplicationFullName == "IfcOpenShell" + assert application.ApplicationIdentifier == "IfcOpenShell" + assert developer.is_a("IfcOrganization") + assert developer.Identification == "IfcOpenShell" + assert developer.Name == "IfcOpenShell" + assert developer.Description == "IfcOpenShell is an open source software library that helps users and software developers to work with IFC data." + assert developer.Roles[0].Role == "USERDEFINED" + assert developer.Roles[0].UserDefinedRole == "CONTRIBUTOR" + assert developer.Addresses[0].is_a("IfcTelecomAddress") + assert developer.Addresses[0].Purpose == "USERDEFINED" + assert developer.Addresses[0].UserDefinedPurpose == "WEBPAGE" + assert developer.Addresses[0].WWWHomePageURL == "https://ifcopenshell.org"