typing

src/blenderbim/blenderbim/bim/import_ifc.py

@@ -38,8 +38,9 @@ import blenderbim.tool as tool
 import ifcopenshell.ifcopenshell_wrapper as ifcopenshell_wrapper
 from itertools import chain, accumulate
 from blenderbim.bim.ifc import IfcStore, IFC_CONNECTED_TYPE
+from blenderbim.tool.loader import OBJECT_DATA_TYPE
 from blenderbim.bim.module.drawing.prop import ANNOTATION_TYPES_DATA
-from typing import Dict, Union, Optional
+from typing import Dict, Union, Optional, Any
 
 
 class MaterialCreator:
@@ -855,10 +856,10 @@ class IfcImporter:
             self.create_product(element, mesh=mesh)
         print("Done creating geometry")
 
-    def create_spatial_elements(self):
-        self.create_generic_elements(self.spatial_elements)
+    def create_spatial_elements(self) -> None:
+        self.create_generic_elements(self.spatial_elements, unselectable=True)
 
-    def create_elements(self):
+    def create_elements(self) -> None:
         self.create_generic_elements(self.elements)
         tmp = self.context_settings
         self.context_settings = self.gross_context_settings
@@ -876,7 +877,7 @@ class IfcImporter:
             except:
                 pass
 
-    def create_generic_elements(self, elements: set[ifcopenshell.entity_instance]) -> None:
+    def create_generic_elements(self, elements: set[ifcopenshell.entity_instance], unselectable=False) -> None:
         if isinstance(self.file, ifcopenshell.sqlite):
             return self.create_generic_sqlite_elements(elements)
 
@@ -1108,7 +1109,12 @@ class IfcImporter:
         self.link_element(product, obj)
         return product
 
-    def create_product(self, element, shape=None, mesh=None):
+    def create_product(
+        self,
+        element: ifcopenshell.entity_instance,
+        shape: Optional[Any] = None,
+        mesh: Optional[OBJECT_DATA_TYPE] = None,
+    ) -> Union[bpy.types.Object, None]:
         if element is None:
             return
 
@@ -1833,7 +1839,7 @@ class IfcImporter:
             ):
                 return representation.Items[0].MappingTarget
 
-    def create_curve(self, element, shape):
+    def create_curve(self, element: ifcopenshell.entity_instance, shape) -> bpy.types.Curve:
         if hasattr(shape, "geometry"):
             geometry = shape.geometry
         else:

src/blenderbim/blenderbim/tool/loader.py

@@ -26,6 +26,7 @@ import os
 import numpy as np
 from mathutils import Vector
 from pathlib import Path
+from typing import Union
 
 
 # Progressively we'll refactor loading elements into Blender objects into this
@@ -34,6 +35,9 @@ from pathlib import Path
 # supplementary objects (e.g. drawings, structural analysis models, etc).
 
 
+OBJECT_DATA_TYPE = Union[bpy.types.Mesh, bpy.types.Curve]
+
+
 class Loader(blenderbim.core.tool.Loader):
     @classmethod
     def create_project_collection(cls, name: str) -> bpy.types.Collection:
@@ -51,7 +55,7 @@ class Loader(blenderbim.core.tool.Loader):
         return collection
 
     @classmethod
-    def get_mesh_name(cls, geometry):
+    def get_mesh_name(cls, geometry) -> str:
         representation_id = geometry.id
         if "-" in representation_id:
             representation_id = int(re.sub(r"\D", "", representation_id.split("-")[0]))
@@ -62,11 +66,11 @@ class Loader(blenderbim.core.tool.Loader):
         return "{}/{}".format(context_id, representation_id)
 
     @classmethod
-    def get_name(cls, element):
+    def get_name(cls, element: ifcopenshell.entity_instance) -> str:
         return "{}/{}".format(element.is_a(), getattr(element, "Name", "None"))
 
     @classmethod
-    def link_mesh(cls, shape, mesh):
+    def link_mesh(cls, shape, mesh: OBJECT_DATA_TYPE) -> None:
         geometry = shape.geometry if hasattr(shape, "geometry") else shape
         if "-" in geometry.id:
             mesh.BIMMeshProperties.ifc_definition_id = int(geometry.id.split("-")[0])