topologicpy 0.7.9__py3-none-any.whl → 0.7.11__py3-none-any.whl

topologicpy/Edge.py

@@ -221,7 +221,7 @@ class Edge():
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Topology import Topology
-
+        
         edge = None
         if not Topology.IsInstance(vertexA, "Vertex"):
             if not silent:
@@ -297,7 +297,11 @@ class Edge():
             if not silent:
                 print("Edge.ByVertices - Error: The input vertices parameter has less than two vertices. Returning None.")
             return None
-        return Edge.ByStartVertexEndVertex(vertexList[0], vertexList[-1], tolerance=tolerance, silent=silent)
+        edge = Edge.ByStartVertexEndVertex(vertexList[0], vertexList[-1], tolerance=tolerance, silent=silent)
+        if not edge:
+            if not silent:
+                print("Edge.ByVertices - Error: Could not create an edge. Returning None.")
+        return edge
     
     @staticmethod
     def ByVerticesCluster(cluster, tolerance: float = 0.0001):

topologicpy/Face.py

@@ -1254,7 +1254,7 @@ class Face():
         return Vector.IsCollinear(dirA, dirB)
 
     @staticmethod
-    def Isovist(face, vertex, obstacles = None, fromAngle=0, toAngle=360, tolerance: float = 0.0001):
+    def Isovist(face, vertex, obstacles: list = [], direction: list = [0,1,0], fov: float = 360, 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.
@@ -1267,14 +1267,17 @@ class Face():
             The vertex representing the location of the viewpoint of the isovist.
         obstacles : list , optional
             A list of wires representing the obstacles within the face. All obstacles are assumed to be within the
-            boundary of the face.
-        fromAngle : float , optional
-            The angle in degrees from which to start creating the arc of the circle. The default is 0.
-            0 is considered to be in the positive X-axis direction. 90 is considered to be in the
-            positive Y-axis direction.
-        toAngle : float , optional
-            The angle in degrees at which to end creating the arc of the circle. The default is 360.
-            Angles are measured in an anti-clockwise fashion.
+            boundary of the face. The default is [].
+        direction : list, optional
+            The vector representing the direction (in the XY plane) in which the observer is facing. The Z component is ignored.
+            The direction follows the Vector.CompassAngle convention where [0,1,0] (North) is considered to be
+            in the positive Y direction, [1,0,0] (East) is considered to be in the positive X-direction.
+            Angles are measured in a clockwise fashion. The default is [0,1,0] (North).
+        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.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional:
             The desired tolerance. The default is 0.0001.
 
@@ -1282,7 +1285,7 @@ class Face():
         -------
         topologic_core.Face
             The face representing the isovist projection from the input viewpoint.
-        
+
         """
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
@@ -1291,7 +1294,8 @@ class Face():
         from topologicpy.Shell import Shell
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
-        
+        from topologicpy.Vector import Vector
+
         def vertexPartofFace(vertex, face, tolerance):
             vertices = []
             _ = face.Vertices(None, vertices)
@@ -1299,45 +1303,104 @@ class Face():
                 if Vertex.Distance(vertex, v) < tolerance:
                     return True
             return False
-        
+
         if not Topology.IsInstance(face, "Face"):
             print("Face.Isovist - Error: The input boundary parameter is not a valid Face. Returning None")
             return None
         if not Topology.IsInstance(vertex, "Vertex"):
             print("Face.Isovist - Error: The input viewPoint parameter is not a valid Vertex. Returning None")
             return None
+        if fov < 1 or fov > 360:
+            print("Face.Isovist - Error: The input fov parameter is outside the acceptable range of 0 to 360 degrees. Returning None")
+            return None
         if isinstance(obstacles, list):
             obstacles = [obs for obs in obstacles if Topology.IsInstance(obs, "Wire")]
+        else:
+            obstacles = []
+        
+        origin = Vertex.Origin()
+        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]
+        new_vertices = [Vertex.ByCoordinates(coord) for coord in coords]
+        eb = Wire.ByVertices(new_vertices, close=True)
+
+        ib_list = Face.InternalBoundaries(flat_face)
+        new_ib_list = []
+        for ib in ib_list:
+            vertices = Topology.Vertices(ib)
+            coords = [Vertex.Coordinates(v, outputType="xy") for v in vertices]
+            new_vertices = [Vertex.ByCoordinates(coord) for coord in coords]
+            new_ib_list.append(Wire.ByVertices(new_vertices, close=True))
+
+        flat_face = Face.ByWires(eb, new_ib_list)
         for obs in obstacles:
-            face = Topology.Difference(face, Face.ByWire(obs))
-        targets = Topology.Vertices(face)
+            flat_face = Topology.Difference(flat_face, Face.ByWire(obs))
+        targets = Topology.Vertices(flat_face)
         distances = []
         for target in targets:
-            distances.append(Vertex.Distance(vertex, target))
+            distances.append(Vertex.Distance(flat_vertex, target))
         distances.sort()
         max_d = distances[-1]*1.05
         edges = []
         for target in targets:
-            if Vertex.Distance(vertex, target) > tolerance:
-                e = Edge.ByVertices(vertex, target)
-                e = Edge.SetLength(e, length=max_d, bothSides=False)
+            if Vertex.Distance(flat_vertex, target) > tolerance:
+                e = Edge.ByVertices(flat_vertex, target, silent=True)
+                e = Edge.SetLength(e, length=max_d, bothSides=False, tolerance=tolerance)
                 edges.append(e)
-        shell = Topology.Slice(face, Cluster.ByTopologies(edges))
+        shell = Topology.Slice(flat_face, Cluster.ByTopologies(edges))
         faces = Topology.Faces(shell)
         final_faces = []
-        for face in faces:
-            if vertexPartofFace(vertex, face, tolerance=0.001):
-                final_faces.append(face)
+        for f in faces:
+            if vertexPartofFace(flat_vertex, f, tolerance=0.001):
+                final_faces.append(f)
         shell = Shell.ByFaces(final_faces)
-        return_face = Topology.RemoveCoplanarFaces(shell)
-        if abs(360 - toAngle - fromAngle) > tolerance:
+        return_face = Topology.RemoveCoplanarFaces(shell, epsilon=0.1)
+        if not Topology.IsInstance(return_face, "face"):
+            temp = Shell.ExternalBoundary(shell)
+            if Topology.IsInstance(temp, "Wire"):
+                return_face = Face.ByWire(temp)
+            elif Topology.IsInstance(temp, "Cluster"):
+                edges = Topology.Edges(temp)
+                vertices = Topology.Vertices(temp)
+                vertices = Vertex.Fuse(vertices, tolerance=0.01)
+                new_edges = []
+                for edge in edges:
+                    sv = vertices[Vertex.Index(Edge.StartVertex(edge), vertices, tolerance=0.01)]
+                    ev = vertices[Vertex.Index(Edge.EndVertex(edge), vertices, tolerance=0.01)]
+                    if Vertex.Distance(sv, ev) > tolerance:
+                        new_edges.append(Edge.ByVertices([sv,ev]))
+                w = Wire.ByEdges(new_edges, tolerance=0.01)
+                return_face = Face.ByWire(w)
+            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)
+        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)
-            e2 = Edge.ByVertices(Wire.EndVertex(c), vertex)
+            e1 = Edge.ByVertices(Wire.StartVertex(c), vertex, silent=True)
+            e2 = Edge.ByVertices(Wire.EndVertex(c), vertex, silent=True)
             edges = Topology.Edges(c) + [e1,e2]
             pie = Face.ByWire(Topology.SelfMerge(Cluster.ByTopologies(edges)))
-            return_face = Topology.Intersect(pie, return_face)
-        return return_face
+        return_face = Topology.Intersect(pie, return_face)
+        if not Topology.IsInstance(return_face, "face"):
+            return_face = Topology.SelfMerge(return_face)
+        if return_face == None:
+            print("Face.Isovist - Error: Could not create isovist. Returning None.")
+            return None
+        simpler_face = Face.RemoveCollinearEdges(return_face)
+        if Topology.IsInstance(simpler_face, "face"):
+            return Topology.Unflatten(simpler_face, origin=origin, direction=normal)
+        return Topology.Unflatten(return_face, origin=origin, direction=normal)
 
     @staticmethod
     def MedialAxis(face, resolution: int = 0, externalVertices: bool = False, internalVertices: bool = False, toLeavesOnly: bool = False, angTolerance: float = 0.1, tolerance: float = 0.0001):

topologicpy/Wire.py

@@ -1519,17 +1519,26 @@ class Wire(Topology):
         normal = Face.Normal(f)
         origin = Topology.Centroid(f)
         w = Topology.Flatten(wire, origin=origin, direction=normal)
+        flat_f = Topology.Flatten(f, origin=origin, direction=normal)
+        flat_normal = Face.Normal(flat_f)
+        if flat_normal[2] < 0:
+            w = Topology.Rotate(w, origin=origin, axis=[1,0,0], angle=180)
         angles = []
         edges = Topology.Edges(w)
         for i in range(len(edges)-1):
             e1 = edges[i]
             e2 = edges[i+1]
-            a = round(360 - Vector.CompassAngle(Edge.Direction(e1), Edge.Direction(e2)), mantissa)
+            a = round(Vector.Angle(Edge.Direction(e1), Vector.Reverse(Edge.Direction(e2))), mantissa)
             angles.append(a)
         e1 = edges[len(edges)-1]
         e2 = edges[0]
-        a = round(360 - Vector.CompassAngle(Edge.Direction(e1), Edge.Direction(e2)), mantissa)
+        a = round(Vector.Angle(Edge.Direction(e1), Vector.Reverse(Edge.Direction(e2))), mantissa)
         angles = [a]+angles
+        # if abs(sum(angles)-(len(angles)-2)*180)<tolerance:
+        #     return angles
+        # else:
+        #     angles = [360-ang for ang in angles]
+        #     return angles
         return angles
 
     @staticmethod
@@ -2203,7 +2212,8 @@ class Wire(Topology):
                 sv = vertices[Vertex.Index(sv, vertices)]
                 ev = Edge.EndVertex(edge)
                 ev = vertices[Vertex.Index(ev, vertices)]
-                new_edges.append(Edge.ByVertices([sv,ev]))
+                if Vertex.Distance(sv, ev) > tolerance:
+                    new_edges.append(Edge.ByVertices([sv,ev]))
             new_wire = Topology.SelfMerge(Cluster.ByTopologies(new_edges), tolerance=tolerance)
             return new_wire
         

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.9'
+__version__ = '0.7.11'

{topologicpy-0.7.9.dist-info → topologicpy-0.7.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.9
+Version: 0.7.11
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: MIT License

{topologicpy-0.7.9.dist-info → topologicpy-0.7.11.dist-info}/RECORD

@@ -6,9 +6,9 @@ topologicpy/Color.py,sha256=UlmRcCSOhqcM_OyMWz4t3Kr75KcgXDhz3uctAJ2n7Ic,18031
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=RpkLnAzjg6arY7cEMs2pDFYzRdkerVg1Wbm9hcE3QaM,138991
 topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,25891
-topologicpy/Edge.py,sha256=KCQm9QfwjsYO4yKE4p4elpha9c4MY6EWAEaK_6mTAjo,52239
+topologicpy/Edge.py,sha256=EiOgg2HtuR-YtL5cpFcLcL1Y3A2Y-m4qPNtLjHGRZBQ,52407
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
-topologicpy/Face.py,sha256=uPVVFF6CLzEW2JaTllQJp7nBsS2w3wAz7qwfujWTQAk,97474
+topologicpy/Face.py,sha256=IiejcLoTDhY0C97I-2IQuOniHf7vDirpzjhG_rj4X5s,101031
 topologicpy/Graph.py,sha256=IFEGU0MCE4_fPe2j8sx1vuXPKMjGaov5wTlgRAwB7ns,384631
 topologicpy/Grid.py,sha256=2uDFDxg4NqROC-7bNi1BjK5Uz__BPH13afJ-VDBRW0M,18466
 topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
@@ -23,11 +23,11 @@ topologicpy/Sun.py,sha256=3tYb8kssU882lE1gEWg2mxDvCCY_LAVElkyUT6wa-ZU,36935
 topologicpy/Topology.py,sha256=sXvhiMShOjOp0aILjEU6uNDqKm3zEAEdrN_IJgDK47c,308819
 topologicpy/Vector.py,sha256=2OXmty9CKZZzfsg5T4ckml-lPUUvgDvqokcKDsZVN9Y,29806
 topologicpy/Vertex.py,sha256=WjQZf-r8h_Cjwkt_qNN483FCUql20fbv72Ymiq7ZYtw,67462
-topologicpy/Wire.py,sha256=efqePp91BvAdj4JitSW_f-xeGoTFg_AxP5g5pmbBVFw,139047
+topologicpy/Wire.py,sha256=Mr9FhiFmcdASjg85ylGTwQmlrcPJuMJh2XybGlg2JH0,139515
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=zKmTTl0oKv8UEnjDkiAKOUL5t2pURpcJX_sqiJZHBIc,22
-topologicpy-0.7.9.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.9.dist-info/METADATA,sha256=tHxNNM7xU92yefkBRv_hIHib5vZyWKzyazZCTIJeE0s,8404
-topologicpy-0.7.9.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.7.9.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.9.dist-info/RECORD,,
+topologicpy/version.py,sha256=CRTpS8UXaJkuf-9u9BHiQMdmQOwD3_viBSxzJw8B4-8,23
+topologicpy-0.7.11.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.11.dist-info/METADATA,sha256=ZUyfq-XqWnusntlHekNjU8MbsQNOLQEa-9zfwi4GdFw,8405
+topologicpy-0.7.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.7.11.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.11.dist-info/RECORD,,