Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-10 17:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor ownership history system to be simpler and just a usecase. See #1399.

Browse Source
This commit is contained in:
Dion Moult
2021-03-25 11:42:12 +11:00
parent 9c00872a57
commit 489a248e9a
15 changed files with 86 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/api/owner/add_organisation.py
+8 -2
View File
@@ -1,6 +1,12 @@
class Usecase:
def __init__(self, file):
def __init__(self, file, settings={}):
self.file = file
self.settings = {
"Identification": "APTR",
"Name": "Aperture Science",
}
for key, value in settings.items():
self.settings[key] = value
def execute(self):
self.file.createIfcOrganization("APTR", "Aperture Science")
return self.file.create_entity("IfcOrganization", **self.settings)
src/ifcopenshell-python/ifcopenshell/api/owner/add_person.py
+9 -2
View File
@@ -1,6 +1,13 @@
class Usecase:
def __init__(self, file):
def __init__(self, file, settings={}):
self.file = file
self.settings = {
"Identification": "HSeldon",
"FamilyName": "Seldon",
"GivenName": "Hari",
}
for key, value in settings.items():
self.settings[key] = value
def execute(self):
self.file.createIfcPerson("HSeldon", "Seldon", "Hari")
return self.file.create_entity("IfcPerson", **self.settings)
src/ifcopenshell-python/ifcopenshell/api/owner/api.py
-62
View File
@@ -1,62 +0,0 @@
import bpy
import time
import addon_utils
import ifcopenshell.api.owner.create_owner_history as create_owner_history_usecase
import ifcopenshell.api.owner.update_owner_history as update_owner_history_usecase
from blenderbim.bim.ifc import IfcStore
def update_owner_history(element, change_action=None):
if not element.OwnerHistory:
element.OwnerHistory = create_owner_history()
return
file = IfcStore.get_file()
return update_owner_history_usecase.Usecase(
file,
{
"element": element,
"person": file.by_id(int(bpy.context.scene.BIMOwnerProperties.user_person)),
"organisation": file.by_id(int(bpy.context.scene.BIMOwnerProperties.user_organisation)),
"ApplicationIdentifier": "BlenderBIM",
"ApplicationFullName": "BlenderBIM Add-on",
"Version": get_application_version(),
"ChangeAction": change_action or "MODIFIED",
},
).execute()
def create_owner_history(change_action=None):
file = IfcStore.get_file()
if (
not bpy.context.scene.BIMOwnerProperties.user_person
or not bpy.context.scene.BIMOwnerProperties.user_organisation
):
if file.schema == "IFC2X3":
assert False, "A person and organisation is required in IFC2X3."
return None
return create_owner_history_usecase.Usecase(
file,
{
"person": file.by_id(int(bpy.context.scene.BIMOwnerProperties.user_person)),
"organisation": file.by_id(int(bpy.context.scene.BIMOwnerProperties.user_organisation)),
"ApplicationIdentifier": "BlenderBIM",
"ApplicationFullName": "BlenderBIM Add-on",
"Version": get_application_version(),
"ChangeAction": change_action or "ADDED",
},
).execute()
def get_application_version():
return ".".join(
[
str(x)
for x in [
addon.bl_info.get("version", (-1, -1, -1))
for addon in addon_utils.modules()
if addon.bl_info["name"] == "BlenderBIM"
][0]
]
)
src/ifcopenshell-python/ifcopenshell/api/owner/create_owner_history.py
+6 -9
View File
@@ -1,22 +1,19 @@
import time
import ifcopenshell
import ifcopenshell.api.owner.settings
class Usecase:
def __init__(self, file, settings={}):
self.file = file
self.settings = {
"person": None,
"organisation": None,
"ApplicationIdentifier": "",
"ApplicationFullName": "",
"Version": "",
"ChangeAction": "NOTDEFINED",
}
self.settings = ifcopenshell.api.owner.settings.settings
for key, value in settings.items():
self.settings[key] = value
def execute(self):
if self.file.schema != "IFC2X3":
if not self.settings["person"] or not self.settings["organisation"]:
return
user = self.get_user()
application = self.get_application()
return self.file.create_entity(
@@ -25,7 +22,7 @@ class Usecase:
"OwningUser": user,
"OwningApplication": application,
"State": "READWRITE",
"ChangeAction": self.settings["ChangeAction"],
"ChangeAction": self.settings["ChangeAction"] or "ADDED",
"LastModifiedDate": int(time.time()),
"LastModifyingUser": user,
"LastModifyingApplication": application,
src/ifcopenshell-python/ifcopenshell/api/owner/settings.py
+33
View File
@@ -0,0 +1,33 @@
# import bpy
# import addon_utils
settings = {
"person": None,
"organisation": None,
"ApplicationIdentifier": "",
"ApplicationFullName": "",
"Version": "",
"ChangeAction": "NOTDEFINED",
}
# settings = {
# "person": file.by_id(int(bpy.context.scene.BIMOwnerProperties.user_person)),
# "organisation": file.by_id(int(bpy.context.scene.BIMOwnerProperties.user_organisation)),
# "ApplicationIdentifier": "BlenderBIM",
# "ApplicationFullName": "BlenderBIM Add-on",
# "Version": get_application_version(),
# }
#
#
# def get_application_version():
# return ".".join(
# [
# str(x)
# for x in [
# addon.bl_info.get("version", (-1, -1, -1))
# for addon in addon_utils.modules()
# if addon.bl_info["name"] == "BlenderBIM"
# ][0]
# ]
# )
src/ifcopenshell-python/ifcopenshell/api/owner/update_owner_history.py
+5 -9
View File
@@ -1,23 +1,19 @@
import time
import ifcopenshell
import ifcopenshell.api.owner.create_owner_history as create_owner_history
class Usecase:
def __init__(self, file, settings={}):
self.file = file
self.settings = {
"OwnerHistory": None,
"person": None,
"organisation": None,
"ApplicationIdentifier": "",
"ApplicationFullName": "",
"Version": "",
"ChangeAction": "NOTDEFINED",
}
self.settings = ifcopenshell.api.owner.settings.settings
for key, value in settings.items():
self.settings[key] = value
def execute(self):
if not self.settings["element"].OwnerHistory:
self.settings["element"].OwnerHistory = create_owner_history.Usecase(self.file, self.settings).execute()
return
if len(self.file.get_inverse(self.settings["element"].OwnerHistory)) > 1:
old_history = self.settings["element"].OwnerHistory
self.settings["element"].OwnerHistory = self.file.create_entity("IfcOwnerHistory")