Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-09 13:52:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent adding None to guid_map

Browse Source 
OperationData was always including guid key, so guid_map[None] was pointing to some object (typically a style). Also covered by rebuild_element_maps in the most cases.
This commit is contained in:
Andrej730
2024-10-23 15:41:46 +05:00
parent 6f347bcb81
commit 72ea93bc0f
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bonsai/bonsai/bim/ifc.py
+13 -9
View File
@@ -33,7 +33,7 @@ import bonsai.bim.handler
import bonsai.tool as tool import bonsai.tool as tool
from pathlib import Path from pathlib import Path
from bonsai.tool.brick import BrickStore from bonsai.tool.brick import BrickStore
from typing import Set, Union, Optional, TypedDict, Callable from typing import Set, Union, Optional, TypedDict, Callable, NotRequired
IFC_CONNECTED_TYPE = Union[bpy.types.Material, bpy.types.Object] IFC_CONNECTED_TYPE = Union[bpy.types.Material, bpy.types.Object]
@@ -41,7 +41,7 @@ IFC_CONNECTED_TYPE = Union[bpy.types.Material, bpy.types.Object]
class OperationData(TypedDict): class OperationData(TypedDict):
id: int id: int
guid: Union[str, None] guid: NotRequired[str]
obj: str obj: str
@@ -266,8 +266,8 @@ class IfcStore:
IfcStore.unlink_element(obj=existing_obj) IfcStore.unlink_element(obj=existing_obj)
IfcStore.id_map[element.id()] = obj IfcStore.id_map[element.id()] = obj
if hasattr(element, "GlobalId"): if global_id := getattr(element, "GlobalId", None):
IfcStore.guid_map[element.GlobalId] = obj IfcStore.guid_map[global_id] = obj
if element.is_a("IfcSurfaceStyle"): if element.is_a("IfcSurfaceStyle"):
obj.BIMStyleProperties.ifc_definition_id = element.id() obj.BIMStyleProperties.ifc_definition_id = element.id()
@@ -277,7 +277,9 @@ class IfcStore:
tool.Ifc.setup_listeners(obj) tool.Ifc.setup_listeners(obj)
if IfcStore.history: if IfcStore.history:
data = OperationData(id=element.id(), guid=getattr(element, "GlobalId", None), obj=obj.name) data = OperationData(id=element.id(), obj=obj.name)
if global_id:
data["guid"] = global_id
IfcStore.history[-1]["operations"].append( IfcStore.history[-1]["operations"].append(
Operation(rollback=IfcStore.rollback_link_element, commit=IfcStore.commit_link_element, data=data) Operation(rollback=IfcStore.rollback_link_element, commit=IfcStore.commit_link_element, data=data)
) )
@@ -292,7 +294,7 @@ class IfcStore:
@staticmethod @staticmethod
def rollback_link_element(data: OperationData) -> None: def rollback_link_element(data: OperationData) -> None:
del IfcStore.id_map[data["id"]] del IfcStore.id_map[data["id"]]
if data["guid"]: if "guid" in data:
del IfcStore.guid_map[data["guid"]] del IfcStore.guid_map[data["guid"]]
obj = IfcStore.get_object_by_name(data["obj"]) obj = IfcStore.get_object_by_name(data["obj"])
if obj is None: if obj is None:
@@ -316,13 +318,13 @@ class IfcStore:
return return
obj = bpy.data.objects.get(data["obj"]) obj = bpy.data.objects.get(data["obj"])
IfcStore.id_map[data["id"]] = obj IfcStore.id_map[data["id"]] = obj
if data["guid"]: if "guid" in data:
IfcStore.guid_map[data["guid"]] = obj IfcStore.guid_map[data["guid"]] = obj
@staticmethod @staticmethod
def commit_unlink_element(data: OperationData) -> None: def commit_unlink_element(data: OperationData) -> None:
del IfcStore.id_map[data["id"]] del IfcStore.id_map[data["id"]]
if data["guid"]: if "guid" in data:
del IfcStore.guid_map[data["guid"]] del IfcStore.guid_map[data["guid"]]
@staticmethod @staticmethod
@@ -371,7 +373,9 @@ class IfcStore:
pass pass
if IfcStore.history: if IfcStore.history:
data = OperationData(id=element.id(), guid=global_id) data = OperationData(id=element.id())
if global_id:
data["guid"] = global_id
if obj: if obj:
data["obj"] = obj.name data["obj"] = obj.name
IfcStore.history[-1]["operations"].append( IfcStore.history[-1]["operations"].append(