topologicpy 0.7.74__py3-none-any.whl → 0.7.76__py3-none-any.whl

topologicpy/Face.py

@@ -132,7 +132,6 @@ class Face():
         dirA = Face.Normal(faceA, outputType="xyz", mantissa=3)
         dirB = Face.Normal(faceB, outputType="xyz", mantissa=3)
         if dirA == None or dirB == None:
-            Topology.Show(faceA, faceB)
             print("Face.Angle - Error: Could not compute the angle between the two input faces. Returning None.")
             return None
         return round((Vector.Angle(dirA, dirB)), mantissa)
@@ -1707,10 +1706,11 @@ class Face():
         else:
             obstacles = []
         
-        origin = Vertex.Origin()
+        origin = Topology.Centroid(face)
         normal = Face.Normal(face)
         flat_face = Topology.Flatten(face, origin=origin, direction=normal)
         flat_vertex = Topology.Flatten(vertex, origin=origin, direction=normal)
+
         eb = Face.ExternalBoundary(flat_face)
         vertices = Topology.Vertices(eb)
         coords = [Vertex.Coordinates(v, outputType="xy") for v in vertices]
@@ -1728,6 +1728,7 @@ class Face():
         flat_face = Face.ByWires(eb, new_ib_list)
         for obs in obstacles:
             flat_face = Topology.Difference(flat_face, Face.ByWire(obs))
+        
         targets = Topology.Vertices(flat_face)
         distances = []
         for target in targets:
@@ -1748,6 +1749,7 @@ class Face():
                 final_faces.append(f)
         shell = Shell.ByFaces(final_faces)
         return_face = Topology.RemoveCoplanarFaces(shell, epsilon=0.1)
+
         if not Topology.IsInstance(return_face, "face"):
             temp = Shell.ExternalBoundary(shell)
             if Topology.IsInstance(temp, "Wire"):
@@ -1767,17 +1769,16 @@ class Face():
             if not Topology.IsInstance(return_face, "Face"):
                 print("Face.Isovist - Error: Could not create isovist. Returning None.")
                 return None 
-
         compAngle = 0
         if fov == 360:
-            pie = Face.Circle(origin= vertex, radius=max_d, sides=180)
+            pie = Face.Circle(origin= flat_vertex, radius=max_d*1.2, sides=16)
         else:
-            compAngle = Vector.CompassAngle(Vector.North(), direction, mantissa=mantissa, tolerance=tolerance) - 90
-            fromAngle = -fov*0.5 - compAngle
-            toAngle = fov*0.5 - compAngle
-            c = Wire.Circle(origin= vertex, radius=max_d, sides=180, fromAngle=fromAngle, toAngle=toAngle, close = False)
-            e1 = Edge.ByVertices(Wire.StartVertex(c), vertex, silent=True)
-            e2 = Edge.ByVertices(Wire.EndVertex(c), vertex, silent=True)
+            compAngle = Vector.CompassAngle(Vector.North(), direction, mantissa=mantissa, tolerance=tolerance)
+            fromAngle =  compAngle - fov*0.5 
+            toAngle = compAngle + fov*0.5
+            c = Wire.Circle(origin= flat_vertex, radius=max_d*1.2, sides=int(16*(fov/360)), fromAngle=fromAngle, toAngle=toAngle, close = False)
+            e1 = Edge.ByVertices(Wire.StartVertex(c), flat_vertex, silent=True)
+            e2 = Edge.ByVertices(Wire.EndVertex(c), flat_vertex, silent=True)
             edges = Topology.Edges(c) + [e1,e2]
             pie = Face.ByWire(Topology.SelfMerge(Cluster.ByTopologies(edges)))
         return_face = Topology.Intersect(pie, return_face)

topologicpy/Speckle.py

@@ -18,10 +18,22 @@ from specklepy.api.client import SpeckleClient
 from specklepy.api.wrapper import StreamWrapper
 from specklepy.api import operations
 from specklepy.objects import Base
+from specklepy.objects.other import Collection
 from specklepy.objects.other import RenderMaterial
 from specklepy.transports.server import ServerTransport
-from topologicpy.Topology import Topology
 from specklepy.objects.geometry import (Mesh, Point, Polyline)
+
+from topologicpy.Topology import Topology
+from topologicpy.Vertex import Vertex
+from topologicpy.Face import Face
+from topologicpy.Cell import Cell
+from topologicpy.CellComplex import CellComplex
+from topologicpy.Graph import Graph
+from topologicpy.Dictionary import Dictionary
+
+from collections import deque
+from typing import List
+
 class Speckle:
 
     @staticmethod
@@ -108,7 +120,7 @@ class Speckle:
         return branches
     
     @staticmethod
-    def ClientByURL(url="speckle.xyz", token=None):
+    def ClientByURL(url="https://app.speckle.systems/", token=None):
         """
         Parameters
         ----------
@@ -379,7 +391,7 @@ class Speckle:
         transport = ServerTransport(stream.id, client)
         last_obj_id = commit.referencedObject
         speckle_mesh = operations.receive(obj_id=last_obj_id, remote_transport=transport)
-        print(speckle_mesh)
+        # print(speckle_mesh)
         return mesh_to_native(speckle_mesh["@display_value"])
     
     @staticmethod
@@ -506,4 +518,112 @@ class Speckle:
             DESCRIPTION.
 
         """
-        return item.stream.list()
+        return item.stream.list()
+
+    #######################################################
+    # NEW METHODS TO PROCESS IFC
+
+    @staticmethod
+    def SpeckleObject(client, stream, branch, commit):
+        transport = ServerTransport(stream.id, client)
+        last_obj_id = commit.referencedObject
+        speckle_mesh = operations.receive(obj_id=last_obj_id, remote_transport=transport)
+        
+        return speckle_mesh
+    
+    @staticmethod
+    def get_name_from_IFC_name(name) ->  str:
+        "Function is used to get clean speckle element name" 
+
+        import re
+        mapping = {
+            "IFC_WALL_REG": r"(Wall)",
+            "IFC_SLAB_REG": r"(Slab)",
+            "IFC_WINDOW_REG": r"(Window)",
+            "IFC_COLUMN_REG": r"(Column)",
+            "IFC_DOOR_REG": r"(Door)",
+            "IFC_SPACE_REG": r"(Space)"
+        }
+
+        for expression in mapping.values():
+            res = re.findall(expression, name)
+            if res:
+                return res[0]
+        
+
+    @staticmethod
+    def TopologyBySpeckleObject(obj):
+
+        def from_points_to_vertices_3D(points) -> List[Vertex]:
+            points_array_length = len(points)
+            i = 0
+            topologic_vertices = []
+            while i < points_array_length:
+                x = points[i]
+                y = points[i+1]
+                z = points[i+2]
+                v = Vertex.ByCoordinates(x, y, z)
+                topologic_vertices.append(v)
+
+                i+=3
+            return topologic_vertices
+
+        def make_faces_from_indices(vertices, face_indices) -> List[Face]:
+            "Helping function used to make a triangular faces"
+            l = len(face_indices)
+            i = 0
+            triangles = []
+
+            while i < l:
+                curr = face_indices[i]
+                i+=1
+                lis = face_indices[i:curr+i]
+                triangles.append(lis)
+                i+=curr
+            
+            topologic_vertices = from_points_to_vertices_3D(vertices)
+            faces_list = []
+
+            for triangle in triangles:
+                v1 = topologic_vertices[triangle[0]]
+                v2 = topologic_vertices[triangle[1]]
+                v3 = topologic_vertices[triangle[2]]
+                f = Face.ByVertices([v1, v2, v3])
+                faces_list.append(f)
+
+            return faces_list
+
+        #Stack used for the tree traversal
+        stack = deque()
+        stack.append(obj)
+
+        #list of coordinates
+        coords = []
+
+        while len(stack) > 0:
+            head = stack.pop()
+                
+            if isinstance(head, Collection):
+                for el in head.elements:
+                    stack.append(el)
+
+            elif isinstance(head, Base):
+
+                if hasattr(head, '@displayValue'):
+                    meshes = head['@displayValue']
+                    # print(head.name)
+                    if isinstance(meshes, List):
+                        full_name = head.name
+                        short_name = Speckle.get_name_from_IFC_name(full_name)
+                        speckle_id = head.id
+
+                        mesh_faces = []
+                        for mesh in meshes:
+                            # print(mesh.get_serializable_attributes())
+                            faces = make_faces_from_indices(vertices=mesh.vertices,
+                                                            face_indices=mesh.faces)
+                            mesh_faces.append(faces)
+
+                        yield [short_name, full_name, speckle_id, mesh_faces]
+
+                # stack.pop()

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.74'
+__version__ = '0.7.76'

{topologicpy-0.7.74.dist-info → topologicpy-0.7.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.74
+Version: 0.7.76
 Summary: An AI-Powered Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: AGPL v3 License
@@ -29,16 +29,16 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <3.14,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy >=1.18.0
-Requires-Dist: scipy >=1.4.1
+Requires-Dist: numpy>=1.18.0
+Requires-Dist: scipy>=1.4.1
 Requires-Dist: pandas
 Requires-Dist: tqdm
 Requires-Dist: plotly
 Requires-Dist: lark
 Requires-Dist: specklepy
-Requires-Dist: topologic-core >=7.0.1
+Requires-Dist: topologic_core>=7.0.1
 Provides-Extra: test
-Requires-Dist: pytest-xdist >=2.4.0 ; extra == 'test'
+Requires-Dist: pytest-xdist>=2.4.0; extra == "test"
 
 # topologicpy
 

{topologicpy-0.7.74.dist-info → topologicpy-0.7.76.dist-info}/RECORD

@@ -10,7 +10,7 @@ topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=0AsGoz48pGTye_F4KcJopNjD9STeQ50LHc6PPvERFaA,31932
 topologicpy/Edge.py,sha256=9u9SdUxuenLUIK26xwFvPoYV34p0dCfXmHHBxdgvAdM,67164
 topologicpy/EnergyModel.py,sha256=AqTtmXE35SxvRXhG3vYAQd7GQDW-6HtjYPHua6ME4Eg,53762
-topologicpy/Face.py,sha256=q7x6auTju6IS3mdOhhXZdU3rqKSuJCE-5EOfxofDDMI,124348
+topologicpy/Face.py,sha256=9E3AaTCkcENwmTbFgyZKkdmhjVXHO_q9clQSji2685M,124363
 topologicpy/Graph.py,sha256=BuSg8ilbZd2Qqoenmtw5FrkSe1fDLFS6jshljvq4dOs,416822
 topologicpy/Grid.py,sha256=9N6PE84qCm40TRi2WtlVZSBwXXr47zHpscEpZHg_JW4,18205
 topologicpy/Helper.py,sha256=Sv35czP_j0oLDeJcN8usswUm4U3auiK1LQ_Z_HBvxxg,21716
@@ -21,16 +21,16 @@ topologicpy/Plotly.py,sha256=VNUHRUNu4NUmf3HScQRml3TcwHe_ZoqXjqwttGSuU88,112642
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
 topologicpy/Shell.py,sha256=8OJjlWk9eCZ3uGOTht6ZVrcMczCafw-YWoDGueaz7eg,87673
-topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
+topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
 topologicpy/Topology.py,sha256=J1eTBp8esd9jwcQ4fY82uTjJtj6r9WiaGIZmevRxxDQ,406736
 topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
 topologicpy/Vertex.py,sha256=ZS6xK89JKokBKc0W8frdRhhuzR8c-dI1TTLt7pTf1iA,71032
 topologicpy/Wire.py,sha256=eVet2OToVsXi9AkDYo35LpfMPqJ6aKGD6QkiU4-Jvs8,182271
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=_XwNUtWN5b4vRt6q08wKnk-7iLHDZXyRKXWBhgnWyP4,23
-topologicpy-0.7.74.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.74.dist-info/METADATA,sha256=QQ-v5awljewQVDPhAMmdZdVtUcKzJh4LRiYGoCePtmk,10493
-topologicpy-0.7.74.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-topologicpy-0.7.74.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.74.dist-info/RECORD,,
+topologicpy/version.py,sha256=3M8WghUyEKh4Nub9zc52IBDUVRayyZVk2cK9zf5M-VY,23
+topologicpy-0.7.76.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.76.dist-info/METADATA,sha256=iMOr84bFL_JI4Gr37GGBrxyIb6i7TOZxJaCKcIHHj_0,10488
+topologicpy-0.7.76.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+topologicpy-0.7.76.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.76.dist-info/RECORD,,

{topologicpy-0.7.74.dist-info → topologicpy-0.7.76.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any