From 23d01f3da4a7b5c0c0bc8e7422fe9a02add44ceb Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Thu, 19 Jun 2025 10:08:01 +0100 Subject: [PATCH] Format --- main.py | 6 ------ .../converter/collection_to_speckle.py | 1 - .../converter/data_object_converter.py | 1 - .../converter/geometry_converter.py | 19 +++++++++---------- .../converter/spatial_element_to_speckle.py | 1 - src/speckleifc/ifc_geometry_processing.py | 1 - src/speckleifc/importer.py | 1 - src/speckleifc/root_object_builder.py | 1 - 8 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 main.py diff --git a/main.py b/main.py deleted file mode 100644 index df48a0b..0000000 --- a/main.py +++ /dev/null @@ -1,6 +0,0 @@ -def main(): - print("Hello from ifc-openshell-file-importer!") - - -if __name__ == "__main__": - main() diff --git a/src/speckleifc/converter/collection_to_speckle.py b/src/speckleifc/converter/collection_to_speckle.py index 9db29c0..0c0518a 100644 --- a/src/speckleifc/converter/collection_to_speckle.py +++ b/src/speckleifc/converter/collection_to_speckle.py @@ -10,7 +10,6 @@ from speckleifc.converter.geometry_converter import geometry_to_speckle def data_object_to_speckle( shape: TriangulationElement, step_element: entity_instance ) -> DataObject: - geometry = cast(Triangulation, shape.geometry) display_value = geometry_to_speckle(geometry) diff --git a/src/speckleifc/converter/data_object_converter.py b/src/speckleifc/converter/data_object_converter.py index 5a4077b..b9d8695 100644 --- a/src/speckleifc/converter/data_object_converter.py +++ b/src/speckleifc/converter/data_object_converter.py @@ -10,7 +10,6 @@ from speckleifc.converter.geometry_converter import geometry_to_speckle def data_object_to_speckle( shape: TriangulationElement, step_element: entity_instance ) -> DataObject: - geometry = cast(Triangulation, shape.geometry) display_value = geometry_to_speckle(geometry) diff --git a/src/speckleifc/converter/geometry_converter.py b/src/speckleifc/converter/geometry_converter.py index 27035da..3c88c71 100644 --- a/src/speckleifc/converter/geometry_converter.py +++ b/src/speckleifc/converter/geometry_converter.py @@ -8,7 +8,6 @@ from specklepy.objects.geometry import Mesh def geometry_to_speckle(geometry: Triangulation) -> list[Base]: - materials = cast(Sequence[int], geometry.materials) MESH_COUNT = max(len(materials), 1) @@ -49,15 +48,15 @@ def geometry_to_speckle(geometry: Triangulation) -> list[Base]: i += 1 face_index += 3 # number of items in the faces list we just jumped over - mapped_index_counters[ - mesh_index - ] += 3 # number of verts we just added to the mesh.vertices i.e. the next index - mapped_faces_pointers[ - mesh_index - ] += 4 # number of item's we've just added to the mesh.faces list - mapped_vertices_pointers[ - mesh_index - ] += 9 # number of item's we've just added to the mesh.vertices list + mapped_index_counters[mesh_index] += ( + 3 # number of verts we just added to the mesh.vertices i.e. the next index + ) + mapped_faces_pointers[mesh_index] += ( + 4 # number of item's we've just added to the mesh.faces list + ) + mapped_vertices_pointers[mesh_index] += ( + 9 # number of item's we've just added to the mesh.vertices list + ) return mapped_meshes # type: ignore diff --git a/src/speckleifc/converter/spatial_element_to_speckle.py b/src/speckleifc/converter/spatial_element_to_speckle.py index 70d1e69..6afae05 100644 --- a/src/speckleifc/converter/spatial_element_to_speckle.py +++ b/src/speckleifc/converter/spatial_element_to_speckle.py @@ -9,7 +9,6 @@ from speckleifc.ifc_geometry_processing import get_shape def spatial_element_to_speckle(step_element: entity_instance) -> DataObject: - if step_element.Representation is not None: shape = get_shape(step_element) geometry = cast(Triangulation, shape.geometry) diff --git a/src/speckleifc/ifc_geometry_processing.py b/src/speckleifc/ifc_geometry_processing.py index 1e2e7d8..54d328c 100644 --- a/src/speckleifc/ifc_geometry_processing.py +++ b/src/speckleifc/ifc_geometry_processing.py @@ -36,7 +36,6 @@ def open_ifc(file_path: str) -> file: def create_geometry_iterator(ifc_file: file | sqlite) -> iterator: - return iterator(_IFC_ITERATOR_SETTINGS, ifc_file, multiprocessing.cpu_count() // 2) diff --git a/src/speckleifc/importer.py b/src/speckleifc/importer.py index cd29b68..36bf6ca 100644 --- a/src/speckleifc/importer.py +++ b/src/speckleifc/importer.py @@ -13,7 +13,6 @@ from speckleifc.root_object_builder import RootObjectBuilder class ImportJob: - def __init__(self, ifc_file: file): self._ifc_file = ifc_file self.builder = RootObjectBuilder() diff --git a/src/speckleifc/root_object_builder.py b/src/speckleifc/root_object_builder.py index 7017b81..af5dc14 100644 --- a/src/speckleifc/root_object_builder.py +++ b/src/speckleifc/root_object_builder.py @@ -51,7 +51,6 @@ class RootObjectBuilder: def apply_relationship( self, current: Base, step_id: int, root_commit_object: Base ) -> None: - parents = self._parent_infos[step_id] for parent_id, prop_name in parents: