topologicpy 0.7.14__py3-none-any.whl → 0.7.17__py3-none-any.whl

topologicpy/Wire.py

@@ -334,12 +334,9 @@ class Wire(Topology):
         return Wire.ByEdges(edges, tolerance=tolerance)
 
     @staticmethod
-    def ByOffset(wire, offset: float = 1.0,
-                 miter: bool = False, miterThreshold: float = None,
-                 offsetKey: str = None, miterThresholdKey: str = None,
-                 step: bool = True, angTolerance: float = 0.1, tolerance: float = 0.0001):
+    def ByOffset(wire, offset: float = 1.0, bisectors: bool = False, tolerance: float = 0.0001):
         """
-        Creates an offset wire from the input wire.
+        Creates an offset wire from the input wire. A positive offset value results in an offset to the interior of the anti-clockwise wire.
 
         Parameters
         ----------
@@ -347,18 +344,8 @@ class Wire(Topology):
             The input wire.
         offset : float , optional
             The desired offset distance. The default is 1.0.
-        miter : bool , optional
-            if set to True, the corners will be mitered. The default is False.
-        miterThreshold : float , optional
-            The distance beyond which a miter should be added. The default is None which means the miter threshold is set to the offset distance multiplied by the square root of 2.
-        offsetKey : str , optional
-            If specified, the dictionary of the edges will be queried for this key to specify the desired offset. The default is None.
-        miterThresholdKey : str , optional
-            If specified, the dictionary of the vertices will be queried for this key to specify the desired miter threshold distance. The default is None.
-        step : bool , optional
-            If set to True, The transition between collinear edges with different offsets will be a step. Otherwise, it will be a continous edge. The default is True.
-        angTolerance : float , optional
-            The desired angular tolerance. The default is 0.1.
+        bisectors : bool , optional
+            If set to True, The bisectors (seams) edges will be included in the returned wire. The default is False.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         
@@ -368,169 +355,76 @@ class Wire(Topology):
             The created wire.
 
         """
+        def compute_h(alpha, offset):
+            import math
+            alpha = math.radians(alpha) *0.5
+            h = offset/math.cos(alpha)
+            return h
+        
         from topologicpy.Vertex import Vertex
         from topologicpy.Edge import Edge
         from topologicpy.Face import Face
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
-
-        from random import randrange, sample
+        from topologicpy.Vector import Vector
+        import math
 
         if not Topology.IsInstance(wire, "Wire"):
+            print("Wire.ByOffset - Error: The input wire parameter is not a valid wire. Returning None")
             return None
-        if not miterThreshold:
-            miterThreshold = offset*math.sqrt(2)
-        flatFace = Face.ByWire(wire, tolerance=tolerance)
-        origin = Topology.Centroid(flatFace)
-        normal = Face.Normal(flatFace)
-        flatFace = Topology.Flatten(flatFace, origin=origin, direction=normal)
-        
-        edges = Wire.Edges(wire)
-        vertices = Wire.Vertices(wire)
-        flatEdges = []
-        flatVertices = []
-        newEdges = []
-        for i in range(len(vertices)):
-            flatVertex = Topology.Flatten(vertices[i], origin=origin, direction=normal)
-            flatVertices.append(flatVertex)
-        vertices = flatVertices
-        for i in range(len(edges)):
-            flatEdge = Topology.Flatten(edges[i], origin=origin, direction=normal)
-            flatEdges.append(flatEdge)
-            if offsetKey:
-                d = Topology.Dictionary(edges[i])
-                value = Dictionary.ValueAtKey(d, key=offsetKey)
-                c = Topology.Centroid(flatEdge)
-                if value:
-                    finalOffset = value
-                else:
-                    finalOffset = offset
-            else:
-                finalOffset = offset
-            e1 = Edge.ByOffset2D(flatEdge,finalOffset)
-            newEdges.append(e1)
-        edges = flatEdges
-        newVertices = []
-        dupVertices = []
-        if Wire.IsClosed(wire):
-            e1 = newEdges[-1]
-            e2 = newEdges[0]
-            intV = Topology.Intersect(e1,e2)
-            if intV:
-                newVertices.append(intV)
-                dupVertices.append(vertices[0])
-            elif step:
-                edgeVertices= Edge.Vertices(e1)
-                newVertices.append(Vertex.NearestVertex(vertices[-1], Cluster.ByTopologies(edgeVertices), useKDTree=False))
-                edgeVertices= Edge.Vertices(e2)
-                newVertices.append(Vertex.NearestVertex(vertices[0], Cluster.ByTopologies(edgeVertices), useKDTree=False))
-                dupVertices.append(vertices[0])
-                dupVertices.append(vertices[0])
-            else:
-                tempEdge1 = Edge.ByVertices([Edge.StartVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=True)
-                normal = Edge.Normal(e1)
-                normal = [normal[0]*finalOffset*10, normal[1]*finalOffset*10, normal[2]*finalOffset*10]
-                tempV = Vertex.ByCoordinates(vertices[0].X()+normal[0], vertices[0].Y()+normal[1], vertices[0].Z()+normal[2])
-                tempEdge2 = Edge.ByVertices([vertices[0], tempV], tolerance=tolerance, silent=True)
-                intV = Topology.Intersect(tempEdge1,tempEdge2)
-                newVertices.append(intV)
-                dupVertices.append(vertices[0])
+        if abs(offset) < tolerance:
+            return wire
+        vertices = Topology.Vertices(wire)
+        if len(vertices) < 3:
+            print("Wire.ByOffset - Error: The input wire parameter contains less than three vertices. Cannot proceed. Returning None")
+            return None
+        if not Wire.IsClosed(wire):
+            w = Wire.ByVertices(vertices, close=True)
         else:
-            newVertices.append(Edge.StartVertex(newEdges[0]))
-        
-        for i in range(len(newEdges)-1):
-            e1 = newEdges[i]
-            e2 = newEdges[i+1]
-            intV = Topology.Intersect(e1,e2)
-            if intV:
-                newVertices.append(intV)
-                dupVertices.append(vertices[i+1])
-            elif step:
-                newVertices.append(Edge.EndVertex(e1))
-                newVertices.append(Edge.StartVertex(e2))
-                dupVertices.append(vertices[i+1])
-                dupVertices.append(vertices[i+1])
-            else:
-                tempEdge1 = Edge.ByVertices([Edge.StartVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=True)
-                normal = Edge.Normal(e1)
-                normal = [normal[0]*finalOffset*10, normal[1]*finalOffset*10, normal[2]*finalOffset*10]
-                tempV = Vertex.ByCoordinates(vertices[i+1].X()+normal[0], vertices[i+1].Y()+normal[1], vertices[i+1].Z()+normal[2])
-                tempEdge2 = Edge.ByVertices([vertices[i+1], tempV], tolerance=tolerance, silent=True)
-                intV = Topology.Intersect(tempEdge1,tempEdge2)
-                newVertices.append(intV)
-                dupVertices.append(vertices[i+1])
-
-        vertices = dupVertices
+            w = wire
+        three_vertices = Wire.Vertices(w)[0:3]
+        temp_w = Wire.ByVertices(three_vertices, close=True)
+        flat_face = Face.ByWire(temp_w, tolerance=tolerance)
+        origin = Vertex.Origin()
+        normal = Face.Normal(flat_face)
+        flat_wire = Topology.Flatten(w, origin=origin, direction=normal)
+        edges = Wire.Edges(flat_wire)
+        vertices = Wire.Vertices(flat_wire)
+        int_angles = Wire.InteriorAngles(flat_wire)
+        bisector_list = []
+        final_vertices = []
+        for i in range(len(vertices)):
+            v_edges = Topology.SuperTopologies(vertices[i], flat_wire, topologyType="edge")
+            if len(v_edges) < 2:
+                continue
+            bisector = Edge.Bisect(v_edges[0], v_edges[1], length=offset, placement=1)
+            if int_angles[i] > 180:
+                bisector = Topology.TranslateByDirectionDistance(bisector, Vector.Reverse(Edge.Direction(bisector)), distance=abs(offset))
+                bisector = Edge.Reverse(bisector)
+            
+            h = abs(compute_h(180-int_angles[i], abs(offset)))
+            bisector = Edge.SetLength(bisector, length=h, bothSides=False)
+            final_vertices.append(Edge.EndVertex(bisector))        
+            bisector_list.append(bisector)
+        return_wire = Wire.ByVertices(final_vertices, close=Wire.IsClosed(wire))
+        vertices = Topology.Vertices(return_wire)
         if not Wire.IsClosed(wire):
-            newVertices.append(Edge.EndVertex(newEdges[-1]))
-        newWire = Wire.ByVertices(newVertices, close=Wire.IsClosed(wire))
-        
-        newVertices = Wire.Vertices(newWire)
-        newEdges = Wire.Edges(newWire)
-        miterEdges = []
-        cleanMiterEdges = []
-        # Handle miter
-        if miter:
-            for i in range(len(newVertices)):
-                if miterThresholdKey:
-                    d = Topology.Dictionary(vertices[i])
-                    value = Dictionary.ValueAtKey(d, key=miterThresholdKey)
-                    if value:
-                        finalMiterThreshold = value
-                    else:
-                        finalMiterThreshold = miterThreshold
-                else:
-                    finalMiterThreshold = miterThreshold
-                if Vertex.Distance(vertices[i], newVertices[i]) > abs(finalMiterThreshold):
-                    st = Topology.SuperTopologies(newVertices[i], newWire, topologyType="edge")
-                    if len(st) > 1:
-                        e1 = st[0]
-                        e2 = st[1]
-                        if not Edge.IsCollinear(e1, e2, tolerance=tolerance):
-                            e1 = Edge.Reverse(e1, tolerance=tolerance)
-                            bisector = Edge.ByVertices([vertices[i], newVertices[i]], tolerance=tolerance)
-                            nv = Edge.VertexByDistance(bisector, distance=finalMiterThreshold, origin=Edge.StartVertex(bisector), tolerance=0.0001)
-                            vec = Edge.Normal(bisector)
-                            nv2 = Topology.Translate(nv, vec[0], vec[1], 0)
-                            nv3 = Topology.Translate(nv, -vec[0], -vec[1], 0)
-                            miterEdge = Edge.ByVertices([nv2,nv3], tolerance=tolerance)
-                            if miterEdge:
-                                miterEdge = Edge.SetLength(miterEdge, abs(offset)*10)
-                                msv = Topology.Intersect(miterEdge, e1)
-                                mev = Topology.Intersect(miterEdge, e2)
-                                #if msv == None or mev == None:
-                                    #Topology.Show(miterEdge, wire, renderer="browser")
-                                    #Topology.Show(miterEdge, e2, wire, renderer="browser")
-                                if (Vertex.IsInternal(msv, e1,tolerance=0.01) and (Vertex.IsInternal(mev, e2, tolerance=0.01))):
-                                    miterEdge = Edge.ByVertices([msv, mev], tolerance=tolerance)
-                                    if miterEdge:
-                                        cleanMiterEdges.append(miterEdge)
-                                        miterEdge = Edge.SetLength(miterEdge, Edge.Length(miterEdge)*1.02)
-                                        miterEdges.append(miterEdge)
-
-            c = Topology.SelfMerge(Cluster.ByTopologies(newEdges+miterEdges), tolerance=tolerance)
-            vertices = Wire.Vertices(c)
-            subtractEdges = []
-            for v in vertices:
-                edges = Topology.SuperTopologies(v, c, topologyType="edge")
-                if len(edges) == 2:
-                    if not Edge.IsCollinear(edges[0], edges[1], tolerance=tolerance):
-                        adjacentVertices = Topology.AdjacentTopologies(v, c)
-                        total = 0
-                        for adjV in adjacentVertices:
-                            tempEdges = Topology.SuperTopologies(adjV, c, topologyType="edge")
-                            total += len(tempEdges)
-                        if total == 8:
-                            subtractEdges = subtractEdges+edges
-
-            if len(subtractEdges) > 0:
-                newWire = Topology.Boolean(newWire, Cluster.ByTopologies(subtractEdges), operation="difference", tolerance=tolerance)
-                if len(cleanMiterEdges) > 0:
-                    newWire = Topology.Boolean(newWire, Cluster.ByTopologies(cleanMiterEdges), operation="merge", tolerance=tolerance)
-
-        newWire = Topology.Unflatten(newWire, origin=origin, direction=normal)
-        return newWire
+            sv = Topology.Vertices(flat_wire)[0]
+            ev = Topology.Vertices(flat_wire)[-1]
+            first_edge = Topology.SuperTopologies(sv, flat_wire, topologyType="edge")[0]
+            first_normal = Edge.NormalAsEdge(first_edge, length=abs(offset), u = 0)
+            last_edge = Topology.SuperTopologies(ev, flat_wire, topologyType="edge")[0]
+            last_normal = Edge.NormalAsEdge(last_edge, length=abs(offset), u = 1.0)
+            sv1 = Edge.EndVertex(first_normal)
+            ev1 = Edge.EndVertex(last_normal)
+            vertices = [sv1] + vertices[1:-1] + [ev1]
+            bisector_list = [first_normal] + bisector_list[1:-1] + [last_normal]
+        return_wire = Wire.ByVertices(vertices, close=Wire.IsClosed(wire))
+        if bisectors:
+            return_wire = Topology.SelfMerge(Cluster.ByTopologies(bisector_list, Topology.Edges(return_wire)))
+        return_wire = Topology.Unflatten(return_wire, origin=origin, direction=normal)
+        return return_wire
 
     @staticmethod
     def ByVertices(vertices: list, close: bool = True, tolerance: float = 0.0001):
@@ -646,10 +540,10 @@ class Wire(Topology):
         if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.ByCoordinates(0, 0, 0)
         if not Topology.IsInstance(origin, "Vertex"):
-            print("Wire.Circle - Error: The input origin parameter is not a valid Vertex. Retruning None.")
+            print("Wire.Circle - Error: The input origin parameter is not a valid Vertex. Returning None.")
             return None
         if not placement.lower() in ["center", "lowerleft", "upperleft", "lowerright", "upperright"]:
-            print("Wire.Circle - Error: The input placement parameter is not a recognised string. Retruning None.")
+            print("Wire.Circle - Error: The input placement parameter is not a recognized string. Returning None.")
             return None
         radius = abs(radius)
         if radius < tolerance:
@@ -671,8 +565,8 @@ class Wire(Topology):
         sides = int(math.floor(sides))
         for i in range(sides+1):
             angle = fromAngle + math.radians(angleRange/sides)*i
-            x = math.cos(angle)*radius + origin.X()
-            y = math.sin(angle)*radius + origin.Y()
+            x = math.sin(angle)*radius + origin.X()
+            y = math.cos(angle)*radius + origin.Y()
             z = origin.Z()
             xList.append(x)
             yList.append(y)
@@ -746,8 +640,8 @@ class Wire(Topology):
             nearest = nearest_vertex(end, ends)
             if not nearest in used:
                 d = Vertex.Distance(end, nearest)
-                i1 = Vertex.Index(end, vertices)
-                i2 = Vertex.Index(nearest, vertices)
+                i1 = Vertex.Index(end, vertices, tolerance=tolerance)
+                i2 = Vertex.Index(nearest, vertices, tolerance=tolerance)
                 if i1 == None or i2 == None:
                     print("Wire.Close - Error: Something went wrong. Returning None.")
                     return None
@@ -1040,7 +934,7 @@ class Wire(Topology):
     @staticmethod
     def Einstein(origin= None, radius: float = 0.5, direction: list = [0, 0, 1], placement: str = "center", mantissa: int = 6):
         """
-        Creates an aperiodic monotile, also called an 'einstein' tile (meaning one tile in German, not the name of the famous physist). See https://arxiv.org/abs/2303.10798
+        Creates an aperiodic monotile, also called an 'einstein' tile (meaning one tile in German, not the name of the famous physicist). See https://arxiv.org/abs/2303.10798
 
         Parameters
         ----------
@@ -1106,7 +1000,7 @@ class Wire(Topology):
         origin : topologic_core.Vertex , optional
             The location of the origin of the ellipse. The default is None which results in the ellipse being placed at (0, 0, 0).
         inputMode : int , optional
-            The method by wich the ellipse is defined. The default is 1.
+            The method by which the ellipse is defined. The default is 1.
             Based on the inputMode value, only the following inputs will be considered. The options are:
             1. Width and Length (considered inputs: width, length)
             2. Focal Length and Eccentricity (considered inputs: focalLength, eccentricity)
@@ -1158,7 +1052,7 @@ class Wire(Topology):
         origin : topologic_core.Vertex , optional
             The location of the origin of the ellipse. The default is None which results in the ellipse being placed at (0, 0, 0).
         inputMode : int , optional
-            The method by wich the ellipse is defined. The default is 1.
+            The method by which the ellipse is defined. The default is 1.
             Based on the inputMode value, only the following inputs will be considered. The options are:
             1. Width and Length (considered inputs: width, length)
             2. Focal Length and Eccentricity (considered inputs: focalLength, eccentricity)
@@ -1581,7 +1475,7 @@ class Wire(Topology):
         outputType : str , optional
             The desired type of output. The options are case insensitive. The default is "contour". The options are:
                 - "Default" or "Contours" (wires are not connected)
-                - "Raster or "Zigzag" or "Toolpath" (the wire ends are connected to create a continous path)
+                - "Raster or "Zigzag" or "Toolpath" (the wire ends are connected to create a continuous path)
                 - "Grid" (the wire ends are connected to create a grid). 
         mapping : str , optional
             The desired type of mapping for wires with different number of vertices. It is case insensitive. The default is "default". The options are:
@@ -1835,10 +1729,10 @@ class Wire(Topology):
             for anEdge in edges:
                 lengths.append(Edge.Length(anEdge))
             minLength = min(lengths)
-            normalisedLengths = []
+            normalizedLengths = []
             for aLength in lengths:
-                normalisedLengths.append(aLength/minLength)
-            return [x for x in itertools.chain(*itertools.zip_longest(normalisedLengths, angles)) if x is not None]
+                normalizedLengths.append(aLength/minLength)
+            return [x for x in itertools.chain(*itertools.zip_longest(normalizedLengths, angles)) if x is not None]
         
         if (wireA.IsClosed() == False):
             return None
@@ -1951,6 +1845,114 @@ class Wire(Topology):
         vertices.append(Edge.EndVertex(edge))
         return Wire.ByVertices(vertices)
     
+    @staticmethod
+    def Miter(wire, offset: float = 0, offsetKey: str = None, tolerance: float = 0.0001, silent: bool = False):
+        """
+        Fillets (rounds) the interior and exterior corners of the input wire given the input radius. See https://en.wikipedia.org/wiki/Fillet_(mechanics)
+
+        Parameters
+        ----------
+        wire : topologic_core.Wire
+            The input wire.
+        offset : float
+            The desired offset length of the miter along each edge.
+        offsetKey : str , optional
+            If specified, the dictionary of the vertices will be queried for this key to specify the desired offset length. The default is None.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+        silent : bool , optional
+            If set to False, error and warning messages are printed. Otherwise, they are not. The default is False.
+
+        Returns
+        -------
+        topologic_core.Wire
+            The filleted wire.
+
+        """
+        def start_from(edge, v):
+            sv = Edge.StartVertex(edge)
+            ev = Edge.EndVertex(edge)
+            if Vertex.Distance(v, ev) < Vertex.Distance(v, sv):
+                return Edge.Reverse(edge)
+            return edge
+        
+        def compute_kite_edges(alpha, r):
+            # Convert angle to radians
+            alpha = math.radians(alpha) *0.5
+            h = r/math.cos(alpha)
+            a = math.sqrt(h*h - r*r)
+            return [a,h]
+        
+        import math
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
+        from topologicpy.Wire import Wire
+        from topologicpy.Face import Face
+        from topologicpy.Cluster import Cluster
+        from topologicpy.Topology import Topology
+        from topologicpy.Vector import Vector
+        from topologicpy.Dictionary import Dictionary
+        
+        if not Topology.IsInstance(wire, "Wire"):
+            if not silent:
+                print("Wire.Fillet - Error: The input wire parameter is not a valid wire. Returning None.")
+            return None
+        if not Wire.IsManifold(wire):
+            if not silent:
+                print("Wire.Fillet - Error: The input wire parameter is not manifold. Returning None.")
+            return None
+        if not Topology.IsPlanar(wire):
+            if not silent:
+                print("Wire.Fillet - Error: The input wire parameter is not planar. Returning None.")
+            return None
+
+        orig_offset = offset
+        f = Face.BoundingRectangle(wire, tolerance=tolerance)
+        normal = Face.Normal(f)
+        flat_wire = Topology.Flatten(wire, origin=Vertex.Origin(), direction=normal)
+        vertices = Topology.Vertices(flat_wire)
+        final_vertices = []
+        miters = []
+        for v in vertices:
+            offset = orig_offset
+            edges = Topology.SuperTopologies(v, flat_wire, topologyType="edge")
+            if len(edges) == 2:
+                for edge in edges:
+                    ev = Edge.EndVertex(edge)
+                    if Vertex.Distance(v, ev) < tolerance:
+                        edge0 = edge
+                    else:
+                        edge1 = edge
+                ang = Edge.Angle(edge0, edge1)
+                e1 = start_from(edge0, v)
+                e2 = start_from(edge1, v)
+
+                dir1 = Edge.Direction(e1)
+                dir2 = Edge.Direction(e2)
+                if Vector.IsParallel(dir1, dir2) or Vector.IsAntiParallel(dir1, dir2):
+                    pass
+                else:
+                    if isinstance(offsetKey, str):
+                        d = Topology.Dictionary(v)
+                        if Topology.IsInstance(d, "Dictionary"):
+                            v_offset = Dictionary.ValueAtKey(d, offsetKey)
+                            if isinstance(v_offset, float) or isinstance(v_offset, int):
+                                if v_offset >= 0:
+                                    offset = v_offset
+                    if offset > 0 and offset <= Edge.Length(e1) and offset <=Edge.Length(e2):
+                        v1 = Topology.TranslateByDirectionDistance(v, dir1, offset)
+                        v2 = Topology.TranslateByDirectionDistance(v, dir2, offset)
+                        final_vertices += [v1,v2]
+                    else:
+                        print("Wire.Fillet - Warning: The input offset parameter is greater than the length of the edge. Skipping.")
+                        final_vertices.append(v)
+            else:
+                final_vertices.append(v)
+        flat_wire = Wire.ByVertices(final_vertices, close=Wire.IsClosed(wire))
+        # Unflatten the wire
+        return_wire = Topology.Unflatten(flat_wire, origin=Vertex.Origin(), direction=normal)
+        return return_wire
+    
     @staticmethod
     def OrientEdges(wire, vertexA, tolerance=0.0001):
         """
@@ -2162,18 +2164,18 @@ class Wire(Topology):
         if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.ByCoordinates(0, 0, 0)
         if not Topology.IsInstance(origin, "Vertex"):
-            print("Wire.Rectangle - Error: specified origin is not a topologic vertex. Retruning None.")
+            print("Wire.Rectangle - Error: specified origin is not a topologic vertex. Returning None.")
             return None
         if not placement.lower() in ["center", "lowerleft", "upperleft", "lowerright", "upperright"]:
-            print("Wire.Rectangle - Error: Could not find placement in the list of placements. Retruning None.")
+            print("Wire.Rectangle - Error: Could not find placement in the list of placements. Returning None.")
             return None
         width = abs(width)
         length = abs(length)
         if width < tolerance or length < tolerance:
-            print("Wire.Rectangle - Error: One or more of the specified dimensions is below the tolerance value. Retruning None.")
+            print("Wire.Rectangle - Error: One or more of the specified dimensions is below the tolerance value. Returning None.")
             return None
         if (abs(direction[0]) + abs(direction[1]) + abs(direction[2])) < tolerance:
-            print("Wire.Rectangle - Error: The direction vector magnitude is below the tolerance value. Retruning None.")
+            print("Wire.Rectangle - Error: The direction vector magnitude is below the tolerance value. Returning None.")
             return None
         xOffset = 0
         yOffset = 0
@@ -2233,9 +2235,9 @@ class Wire(Topology):
             new_edges = []
             for edge in edges:
                 sv = Edge.StartVertex(edge)
-                sv = vertices[Vertex.Index(sv, vertices)]
+                sv = vertices[Vertex.Index(sv, vertices, tolerance=tolerance)]
                 ev = Edge.EndVertex(edge)
-                ev = vertices[Vertex.Index(ev, vertices)]
+                ev = vertices[Vertex.Index(ev, vertices, tolerance=tolerance)]
                 if Vertex.Distance(sv, ev) > tolerance:
                     new_edges.append(Edge.ByVertices([sv,ev]))
             new_wire = Topology.SelfMerge(Cluster.ByTopologies(new_edges), tolerance=tolerance)
@@ -2834,10 +2836,10 @@ class Wire(Topology):
         if not Topology.IsInstance(origin, "Vertex"):
             origin = Vertex.ByCoordinates(0, 0, 0)
         if not Topology.IsInstance(origin, "Vertex"):
-            print("Wire.Squircle - Error: The input origin parameter is not a valid Vertex. Retruning None.")
+            print("Wire.Squircle - Error: The input origin parameter is not a valid Vertex. Returning None.")
             return None
         if not placement.lower() in ["center", "lowerleft", "upperleft", "lowerright", "upperright"]:
-            print("Wire.Squircle - Error: The input placement parameter is not a recognised string. Retruning None.")
+            print("Wire.Squircle - Error: The input placement parameter is not a recognized string. Returning None.")
             return None
         radius = abs(radius)
         if radius < tolerance:

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.14'
+__version__ = '0.7.17'

{topologicpy-0.7.14.dist-info → topologicpy-0.7.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.14
+Version: 0.7.17
 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.17.dist-info/RECORD

@@ -0,0 +1,33 @@
+topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
+topologicpy/Cell.py,sha256=JYP0Qv61Sxgni5nCTd7Hx9pjoUE4F4lje0iMUgDxDO4,99704
+topologicpy/CellComplex.py,sha256=ZxTfpV0Worgnwj4tz-qk2a6OmAtctG_8CnHKnwoVzJU,47452
+topologicpy/Cluster.py,sha256=HvomWm_V4bx76YMxqOEhAUrsvcU6z5e_zry6WxMuV2M,54819
+topologicpy/Color.py,sha256=UlmRcCSOhqcM_OyMWz4t3Kr75KcgXDhz3uctAJ2n7Ic,18031
+topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
+topologicpy/DGL.py,sha256=5jNn1L8F8REx1-oAh9sr_cfil0R5kUuueCNDKwNU_GM,138991
+topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,25891
+topologicpy/Edge.py,sha256=f7LjP662_yoqopAXBh1Gqv8DvdzvfM_heJTP2XnFskY,58447
+topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
+topologicpy/Face.py,sha256=3sMhe86QCo8qLSLlw2CdWkwzVuMNegmnAhUSe__h0iQ,108351
+topologicpy/Graph.py,sha256=90D_G90RBkJ1ZDCLFR2XG2juwnWKfADd0YPIFqIjsck,387669
+topologicpy/Grid.py,sha256=Cpzs9l5-SptMQbUR8AvbbIOHrGMGlK0Qx8FWmQBgvX0,18497
+topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
+topologicpy/Honeybee.py,sha256=dlr5OEH93q51ZmEgvi8PXGfCHBDAjIZ1cm38Rft1Bz4,20235
+topologicpy/Matrix.py,sha256=VV-kbT0Qt5QO38HRFJmD4IMnQUzYbLjBF4xaFAqLh3Q,8352
+topologicpy/Neo4j.py,sha256=Gy2PS4Ky8BNhohKreoV4zgzW9OXCjhSwiZF_Aq21_wU,19589
+topologicpy/Plotly.py,sha256=IYyUIlLYn8YrjPnxXo4SkRzyrI3hVM9dtMZyA3KfWJ8,98845
+topologicpy/Polyskel.py,sha256=pNawz5lnvy4oTzCL91fGY2PblW2hmcYBdT5268m2RZs,19743
+topologicpy/Shell.py,sha256=fdMhCKH5Oq2id16XjTWRe8-06jZ8z8LnrVqMR-33F3s,79144
+topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
+topologicpy/Sun.py,sha256=mN3RzlslcZT3APUtwmWIXVbPkJ6OcKTaTf6338gbMJE,37152
+topologicpy/Topology.py,sha256=O79RJPcMV0-id-1CSRtBdrJHWHLLWdNIAPdfGbPn_qI,339720
+topologicpy/Vector.py,sha256=G4mIIcE5Y-EHfiNV_rxiOz8pJeV3NMEwLu5EOgM0gKA,32653
+topologicpy/Vertex.py,sha256=bD3JnNhizbp6HFhHRve2LK_y5w27jytCbsagOLxKjZQ,71198
+topologicpy/Wire.py,sha256=L9RsS6kmmmF5n7QNNNebQRR6Rg2bFdUaF2RZjyGdRuY,139799
+topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
+topologicpy/version.py,sha256=wcUsHaWS0KncOllDb6GdknQP3quV24cgTSGaGPX-yX0,23
+topologicpy-0.7.17.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.17.dist-info/METADATA,sha256=UP-ISL841EAJkgEPB48Zz9SV52tRttTKCt0DyuIh9xI,8410
+topologicpy-0.7.17.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.7.17.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.17.dist-info/RECORD,,

topologicpy-0.7.14.dist-info/RECORD

@@ -1,33 +0,0 @@
-topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
-topologicpy/Cell.py,sha256=JPRWuD0zxIzv5dIqiUo93HEkRLxTaqKM5_q-XKA1MHA,99356
-topologicpy/CellComplex.py,sha256=VG2y7tRP6rMaBBDducoA5_djHoOSEbjT_TaAlcgTNT8,47432
-topologicpy/Cluster.py,sha256=HvomWm_V4bx76YMxqOEhAUrsvcU6z5e_zry6WxMuV2M,54819
-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=GBm9X-Nu_WBPSTreTKEFAd47X5gwX9svL85IA34cDCM,57211
-topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
-topologicpy/Face.py,sha256=Vq4dsQvuazk_y2FP01SXhXTeub6pJLtewxDSYGB_4Qg,102517
-topologicpy/Graph.py,sha256=IFEGU0MCE4_fPe2j8sx1vuXPKMjGaov5wTlgRAwB7ns,384631
-topologicpy/Grid.py,sha256=Cpzs9l5-SptMQbUR8AvbbIOHrGMGlK0Qx8FWmQBgvX0,18497
-topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
-topologicpy/Honeybee.py,sha256=dlr5OEH93q51ZmEgvi8PXGfCHBDAjIZ1cm38Rft1Bz4,20235
-topologicpy/Matrix.py,sha256=VV-kbT0Qt5QO38HRFJmD4IMnQUzYbLjBF4xaFAqLh3Q,8352
-topologicpy/Neo4j.py,sha256=hNtKWzjb8dQvV2MARDyqW7OInn2LWNiVaA5JmcJl9RM,19569
-topologicpy/Plotly.py,sha256=IYyUIlLYn8YrjPnxXo4SkRzyrI3hVM9dtMZyA3KfWJ8,98845
-topologicpy/Polyskel.py,sha256=pNawz5lnvy4oTzCL91fGY2PblW2hmcYBdT5268m2RZs,19743
-topologicpy/Shell.py,sha256=AFGksfr3HMzr4hru4bGPThRBqmxwW5HXpbtOygv36nU,77020
-topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
-topologicpy/Sun.py,sha256=mN3RzlslcZT3APUtwmWIXVbPkJ6OcKTaTf6338gbMJE,37152
-topologicpy/Topology.py,sha256=_7KiKoi1bUhlwjvRepLoRZ0b4J2AMBGQLff7E9cdu-c,339817
-topologicpy/Vector.py,sha256=EHXf8Dmcuuf-B0611w8spmdcWeM_CibkShb5F1Wr5fo,32667
-topologicpy/Vertex.py,sha256=Fim5tdLACI_PuAeOxnVpTojZuw42q29Sc4JCt3kzXi0,71261
-topologicpy/Wire.py,sha256=HePo_uQyFYnGp34miiX3vlvwnTjJz25pKlasTrlltxM,140831
-topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=T3YWq814HTx1777PMcBZwnLDFm9n_-DeF9W_56Tqee8,23
-topologicpy-0.7.14.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.14.dist-info/METADATA,sha256=1-utDyFzW-bS51EN3TxVi4AzBS3JdzOkpv7LwlkYsMI,8410
-topologicpy-0.7.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.7.14.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.14.dist-info/RECORD,,