topologicpy 0.7.80__py3-none-any.whl → 0.7.81__py3-none-any.whl

topologicpy/Face.py

@@ -1649,7 +1649,7 @@ class Face():
         return are_planes_coplanar(plane_a, plane_b, tolerance=tolerance)
 
     @staticmethod
-    def Isovist(face, vertex, obstacles: list = [], direction: list = [0,1,0], fov: float = 360, mantissa: int = 6, tolerance: float = 0.0001):
+    def Isovist(face, vertex, obstacles: list = [], direction: list = [0,1,0], fov: float = 360, transferDictionaries: bool = False, mantissa: int = 6, tolerance: float = 0.0001):
         """
         Returns the face representing the isovist projection from the input viewpoint.
         This method assumes all input is in 2D. Z coordinates are ignored.
@@ -1671,6 +1671,8 @@ class Face():
         fov : float , optional
             The horizontal field of view (fov) angle in degrees. See https://en.wikipedia.org/wiki/Field_of_view.
             The acceptable range is 1 to 360. The default is 360.
+        transferDictionaries : bool , optional
+            If set to True, the dictionaries of the encountered edges will be transfered to the isovist edges. The default is False.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         tolerance : float , optional:
@@ -1690,6 +1692,8 @@ class Face():
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Vector import Vector
+        from topologicpy.Dictionary import Dictionary
+        from topologicpy.Helper import Helper
 
         def vertexPartofFace(vertex, face, tolerance):
             vertices = Topology.Vertices(face)
@@ -1716,6 +1720,7 @@ class Face():
         normal = Face.Normal(face)
         flat_face = Topology.Flatten(face, origin=origin, direction=normal)
         flat_vertex = Topology.Flatten(vertex, origin=origin, direction=normal)
+        flat_obstacles = [Topology.Flatten(obstacle, origin=origin, direction=normal) for obstacle in obstacles]
 
         eb = Face.ExternalBoundary(flat_face)
         vertices = Topology.Vertices(eb)
@@ -1732,7 +1737,7 @@ class Face():
             new_ib_list.append(Wire.ByVertices(new_vertices, close=True))
 
         flat_face = Face.ByWires(eb, new_ib_list)
-        for obs in obstacles:
+        for obs in flat_obstacles:
             flat_face = Topology.Difference(flat_face, Face.ByWire(obs))
         
         targets = Topology.Vertices(flat_face)
@@ -1795,6 +1800,21 @@ class Face():
             return None
         simpler_face = Face.RemoveCollinearEdges(return_face)
         if Topology.IsInstance(simpler_face, "face"):
+            if transferDictionaries == True:
+                j_edges = [Topology.Edges(t) for t in obstacles]
+                j_edges = Helper.Flatten(j_edges)
+                j_edges += Topology.Edges(face)
+                i_edges = Topology.Edges(simpler_face)
+                used = [0 for _ in range(len(j_edges))]
+                for i, i_edge in enumerate(i_edges):
+                    d_i = Topology.Dictionary(i_edge)
+                    for j, j_edge in enumerate(j_edges):
+                        if used[j] == 0:
+                            if Edge.IsCollinear(i_edge, j_edge):
+                                d_j = Topology.Dictionary(j_edge)
+                                d_result = Dictionary.ByMergedDictionaries([d_i, d_j])
+                                i_edge = Topology.SetDictionary(i_edge, d_result)
+                                used[j] == 1
             return Topology.Unflatten(simpler_face, origin=origin, direction=normal)
         return Topology.Unflatten(return_face, origin=origin, direction=normal)
 

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.80'
+__version__ = '0.7.81'

{topologicpy-0.7.80.dist-info → topologicpy-0.7.81.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.80
+Version: 0.7.81
 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

{topologicpy-0.7.80.dist-info → topologicpy-0.7.81.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=mS7LI3qIo2jfQbibpInArRfXMmTZd7xU8IdvRYUIGSU,124747
+topologicpy/Face.py,sha256=oktXe_qOam1ykYTPo-tjBygPG37Tc4FzuuTzC5r4XsY,126050
 topologicpy/Graph.py,sha256=ZhMVB6ntuhIgTrKLUPryeAJFFBF0cnRsNgESbaohOiw,416914
 topologicpy/Grid.py,sha256=9N6PE84qCm40TRi2WtlVZSBwXXr47zHpscEpZHg_JW4,18205
 topologicpy/Helper.py,sha256=vUWbnZJxn0e9YsFUNyJ5Dee8Nh6TmDp9uCzCk4e0qAA,21897
@@ -28,9 +28,9 @@ topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
 topologicpy/Vertex.py,sha256=mcLJaWFCct03dkVmT25wAl6k0k2EaYvB1PWNO9WQHWg,73465
 topologicpy/Wire.py,sha256=o6MlOjubkJ_f5s1tUamizCsoPKvcQ2OudtJv0yCF-2o,186477
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=aBUXqj0fVv7Q8TFJaUl3kuETKLosGV1MVLaSEclOujg,23
-topologicpy-0.7.80.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.80.dist-info/METADATA,sha256=g22rsF0lEieZmVNOo3LukQGLjnAykoocyDmw2qBPHwg,10513
-topologicpy-0.7.80.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-topologicpy-0.7.80.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.80.dist-info/RECORD,,
+topologicpy/version.py,sha256=iZxz9QXmJIsvAXj4dVDKbSxrlUwOUsiYBfqkVb8YgDc,23
+topologicpy-0.7.81.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.81.dist-info/METADATA,sha256=DOkP8pfJc3ibgaQkLoBgCqjct8GvZumL7I1hQnVBKh8,10513
+topologicpy-0.7.81.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+topologicpy-0.7.81.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.81.dist-info/RECORD,,