From ddc6bd13d1c1e52ab12f165870bd813f15ee5185 Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Thu, 19 Jun 2025 10:06:44 +0100 Subject: [PATCH 1/2] format --- src/speckleifc/__main__.py | 5 +++-- .../converter/data_object_converter.py | 1 - .../converter/geometry_converter.py | 19 +++++++++---------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/speckleifc/__main__.py b/src/speckleifc/__main__.py index e84b81c..29606f0 100644 --- a/src/speckleifc/__main__.py +++ b/src/speckleifc/__main__.py @@ -1,4 +1,5 @@ import time + from specklepy.api.operations import send from specklepy.core.api.client import SpeckleClient from specklepy.core.api.credentials import get_accounts_for_server @@ -23,8 +24,8 @@ def main() -> Version: SERVER_URL = "app.speckle.systems" # FILE = "C:\\Users\\Jedd\\Desktop\\openshell\\60mins.ifc" FILE = "C:\\Users\\Jedd\\Desktop\\openshell\\hillside_house_meters.ifc" - # FILE = "C:\\Users\\Jedd\\Desktop\\openshell\\GRAPHISOFT_Archicad_Sample_Project-S-Office_v1.0_AC25.ifc" - # FILE = "C:\\Users\\Jedd\\Desktop\\openshell\\GRAPHISOFT_Archicad_Sample_Project-S-Office_v1.0_AC25.ifc" + # FILE = "C:\\Users\\Jedd\\Desktop\\openshell\\GRAPHISOFT_Archicad_Sample_Project-S-Office_v1.0_AC25.ifc" # noqa: E501 + # FILE = "C:\\Users\\Jedd\\Desktop\\openshell\\GRAPHISOFT_Archicad_Sample_Project-S-Office_v1.0_AC25.ifc" # noqa: E501 start = time.time() data = convert_file(FILE) diff --git a/src/speckleifc/converter/data_object_converter.py b/src/speckleifc/converter/data_object_converter.py index 4c81913..efc4d3f 100644 --- a/src/speckleifc/converter/data_object_converter.py +++ b/src/speckleifc/converter/data_object_converter.py @@ -8,7 +8,6 @@ from speckleifc.converter.geometry_converter import geometry_to_speckle def data_object_to_speckle(shape: TriangulationElement, ifc_model: file) -> DataObject: - geometry = cast(Triangulation, shape.geometry) display_value = geometry_to_speckle(geometry, ifc_model) diff --git a/src/speckleifc/converter/geometry_converter.py b/src/speckleifc/converter/geometry_converter.py index ebc04a3..4a9145c 100644 --- a/src/speckleifc/converter/geometry_converter.py +++ b/src/speckleifc/converter/geometry_converter.py @@ -9,7 +9,6 @@ from specklepy.objects.geometry import Mesh def geometry_to_speckle(geometry: Triangulation, ifc_model: file) -> list[Base]: - materials = cast(Sequence[int], geometry.materials) MESH_COUNT = max(len(materials), 1) @@ -50,15 +49,15 @@ def geometry_to_speckle(geometry: Triangulation, ifc_model: file) -> 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 From 3193ac5b92a10f6b8baf80c86f3ee1dfa1b7fcc1 Mon Sep 17 00:00:00 2001 From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com> Date: Thu, 19 Jun 2025 10:08:20 +0100 Subject: [PATCH 2/2] deleted old file --- main.py | 6 ------ 1 file changed, 6 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()