topologicpy 0.5.3__py3-none-any.whl → 0.5.5__py3-none-any.whl

topologicpy/CellComplex.py

@@ -53,14 +53,14 @@ class CellComplex(Topology):
     def Box(origin: topologic.Vertex = None,
             width: float = 1.0, length: float = 1.0, height: float = 1.0,
             uSides: int = 2, vSides: int = 2, wSides: int = 2,
-            direction: list = [0,0,1], placement: str = "center", tolerance: float = 0.0001) -> topologic.CellComplex:
+            direction: list = [0, 0, 1], placement: str = "center", tolerance: float = 0.0001) -> topologic.CellComplex:
         """
         Creates a box with internal cells.
 
         Parameters
         ----------
         origin : topologic.Vertex , optional
-            The origin location of the box. The default is None which results in the box being placed at (0,0,0).
+            The origin location of the box. The default is None which results in the box being placed at (0, 0, 0).
         width : float , optional
             The width of the box. The default is 1.
         length : float , optional
@@ -74,7 +74,7 @@ class CellComplex(Topology):
         wSides : int , optional
             The number of sides along the height. The default is 1.
         direction : list , optional
-            The vector representing the up direction of the box. The default is [0,0,1].
+            The vector representing the up direction of the box. The default is [0, 0, 1].
         placement : str , optional
             The description of the placement of the origin of the box. This can be "bottom", "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional
@@ -464,7 +464,6 @@ class CellComplex(Topology):
         from topologicpy.Vector import Vector
         from topologicpy.Aperture import Aperture
         from topologicpy.Topology import Topology
-        from numpy import arctan, pi, signbit, arctan2, rad2deg
 
         def angleCode(f, up, tiltAngle):
             dirA = Face.NormalAtParameters(f)
@@ -511,7 +510,7 @@ class CellComplex(Topology):
             zList.append(f.Centroid().Z())
         zMin = min(zList)
         zMax = max(zList)
-        up = [0,0,1]
+        up = [0, 0, 1]
         for aFace in faces:
             aCode = angleCode(aFace, up, tiltAngle)
             cells = []
@@ -575,7 +574,7 @@ class CellComplex(Topology):
         return d
     
     @staticmethod
-    def Delaunay(vertices: list=None, tolerance: float = 0.0001) -> topologic.CellComplex:
+    def Delaunay(vertices: list = None, tolerance: float = 0.0001) -> topologic.CellComplex:
         """
         Triangulates the input vertices based on the Delaunay method. See https://en.wikipedia.org/wiki/Delaunay_triangulation.
 
@@ -761,7 +760,7 @@ class CellComplex(Topology):
     
     @staticmethod
     def Octahedron(origin: topologic.Vertex = None, radius: float = 0.5,
-                  direction: list = [0,0,1], placement: str ="center", tolerance: float = 0.0001) -> topologic.CellComplex:
+                  direction: list = [0, 0, 1], placement: str ="center", tolerance: float = 0.0001) -> topologic.CellComplex:
         """
         Description
         ----------
@@ -770,11 +769,11 @@ class CellComplex(Topology):
         Parameters
         ----------
         origin : topologic.Vertex , optional
-            The origin location of the octahedron. The default is None which results in the octahedron being placed at (0,0,0).
+            The origin location of the octahedron. The default is None which results in the octahedron being placed at (0, 0, 0).
         radius : float , optional
             The radius of the octahedron's circumscribed sphere. The default is 0.5.
         direction : list , optional
-            The vector representing the up direction of the octahedron. The default is [0,0,1].
+            The vector representing the up direction of the octahedron. The default is [0, 0, 1].
         placement : str , optional
             The description of the placement of the origin of the octahedron. This can be "bottom", "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional
@@ -792,7 +791,7 @@ class CellComplex(Topology):
         from topologicpy.Topology import Topology
 
         if not origin:
-            origin = Vertex.ByCoordinates(0,0,0)
+            origin = Vertex.ByCoordinates(0, 0, 0)
         if not isinstance(origin, topologic.Vertex):
             print("CellComplex.Octahedron - Error: The input origin parameter is not a valid topologic vertex. Returning None.")
             return None
@@ -819,7 +818,7 @@ class CellComplex(Topology):
             octahedron = Topology.Translate(octahedron, 0, 0, radius)
         elif placement == "lowerleft":
             octahedron = Topology.Translate(octahedron, radius, radius, radius)
-        octahedron = Topology.Orient(octahedron, origin=Vertex.Origin(), dirA=[0,0,1], dirB=direction)
+        octahedron = Topology.Orient(octahedron, origin=Vertex.Origin(), dirA=[0, 0, 1], dirB=direction)
         octahedron = Topology.Place(octahedron, originA=Vertex.Origin(), originB=origin)
         return octahedron
     
@@ -827,14 +826,14 @@ class CellComplex(Topology):
     def Prism(origin: topologic.Vertex = None,
               width: float = 1.0, length: float = 1.0, height: float = 1.0,
               uSides: int = 2, vSides: int = 2, wSides: int = 2,
-              direction: list = [0,0,1], placement: str = "center", tolerance: float = 0.0001) -> topologic.CellComplex:
+              direction: list = [0, 0, 1], placement: str = "center", tolerance: float = 0.0001) -> topologic.CellComplex:
         """
         Creates a prismatic cellComplex with internal cells.
 
         Parameters
         ----------
         origin : topologic.Vertex , optional
-            The origin location of the prism. The default is None which results in the prism being placed at (0,0,0).
+            The origin location of the prism. The default is None which results in the prism being placed at (0, 0, 0).
         width : float , optional
             The width of the prism. The default is 1.
         length : float , optional
@@ -848,7 +847,7 @@ class CellComplex(Topology):
         wSides : int , optional
             The number of sides along the height. The default is 1.
         direction : list , optional
-            The vector representing the up direction of the prism. The default is [0,0,1].
+            The vector representing the up direction of the prism. The default is [0, 0, 1].
         placement : str , optional
             The description of the placement of the origin of the prism. This can be "bottom", "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional
@@ -912,12 +911,12 @@ class CellComplex(Topology):
             else:
                 return topologic.CellComplex.ByCells([topology])
         if not isinstance(origin, topologic.Vertex):
-            origin = Vertex.ByCoordinates(0,0,0)
+            origin = Vertex.ByCoordinates(0, 0, 0)
 
         c = Cell.Prism(origin=origin, width=width, length=length, height=height, uSides=1, vSides=1, wSides=1, placement=placement, tolerance=tolerance)
         prism = slice(c, uSides=uSides, vSides=vSides, wSides=wSides)
         if prism:
-            prism = Topology.Orient(prism, origin=origin, dirA=[0,0,1], dirB=direction)
+            prism = Topology.Orient(prism, origin=origin, dirA=[0, 0, 1], dirB=direction)
             return prism
         else:
             print("CellComplex.Prism - Error: Could not create a prism. Returning None.")
@@ -1102,8 +1101,6 @@ class CellComplex(Topology):
         if len(vertices) < 1:
             print("CellComplex.Voronoi - Error: The input vertices parame ter does not contain any vertices that are inside the input cell parameter. Returning None.")
             return None
-        #cell_vertices = Topology.Vertices(cell)
-        #all_vertices = cell_vertices + vertices
         voronoi_points = np.array([Vertex.Coordinates(v) for v in vertices])
         cluster = fracture_with_voronoi(voronoi_points)
         if cluster == None:

topologicpy/Cluster.py

@@ -1081,7 +1081,7 @@ class Cluster(Topology):
         return Cluster.ByTopologies(cellComplexes+cells)
     
     @staticmethod
-    def MysticRose(wire: topologic.Wire = None, origin: topologic.Vertex = None, radius: float = 0.5, sides: int = 16, perimeter: bool = True, direction: list = [0,0,1], placement:str = "center", tolerance: float = 0.0001) -> topologic.Cluster:
+    def MysticRose(wire: topologic.Wire = None, origin: topologic.Vertex = None, radius: float = 0.5, sides: int = 16, perimeter: bool = True, direction: list = [0, 0, 1], placement:str = "center", tolerance: float = 0.0001) -> topologic.Cluster:
         """
         Creates a mystic rose.
 
@@ -1090,7 +1090,7 @@ class Cluster(Topology):
         wire : topologic.Wire , optional
             The input Wire. if set to None, a circle with the input parameters is created. Otherwise, the input parameters are ignored.
         origin : topologic.Vertex , optional
-            The location of the origin of the circle. The default is None which results in the circle being placed at (0,0,0).
+            The location of the origin of the circle. The default is None which results in the circle being placed at (0, 0, 0).
         radius : float , optional
             The radius of the mystic rose. The default is 1.
         sides : int , optional
@@ -1098,7 +1098,7 @@ class Cluster(Topology):
         perimeter : bool , optional
             If True, the perimeter edges are included in the output. The default is True.
         direction : list , optional
-            The vector representing the up direction of the mystic rose. The default is [0,0,1].
+            The vector representing the up direction of the mystic rose. The default is [0, 0, 1].
         placement : str , optional
             The description of the placement of the origin of the mystic rose. This can be "center", or "lowerleft". It is case insensitive. The default is "center".
         tolerance : float , optional

topologicpy/Color.py

@@ -33,7 +33,7 @@ class Color:
         Returns
         -------
         list
-            The color expressed as an [r,g,b] or an [r,g,b,a] list.
+            The color expressed as an [r, g, b] or an [r, g, b, a] list.
         """
         import webcolors
         if not alpha == None:
@@ -66,7 +66,7 @@ class Color:
         Returns
         -------
         list
-            The color expressed as an [r,g,b] or an [r,g,b,a] list.
+            The color expressed as an [r, g, b] or an [r, g, b, a] list.
 
         """
         if not isinstance(hex, str):
@@ -83,7 +83,7 @@ class Color:
         r = int(hex[0:2], 16)
         g = int(hex[2:4], 16)
         b = int(hex[4:6], 16)
-        rgbList = [r,g,b]
+        rgbList = [r, g, b]
         if not alpha == None:
             rgbList.append(alpha)
         return rgbList
@@ -111,7 +111,7 @@ class Color:
         Returns
         -------
         list
-            The color expressed as an [r,g,b] or an [r,g,b,a] list.
+            The color expressed as an [r, g, b] or an [r, g, b, a] list.
 
         """
         if not alpha == None:
@@ -250,12 +250,12 @@ class Color:
     def CSSNamedColor(color):
         """
         Returns the CSS Named color that most closely matches the input color. The input color is assumed to be
-        in the format [r,g,b]. See https://developer.mozilla.org/en-US/docs/Web/CSS/named-color
+        in the format [r, g, b]. See https://developer.mozilla.org/en-US/docs/Web/CSS/named-color
 
         Parameters
         ----------
         color : list
-            The input color. This is assumed to be in the format [r,g,b]
+            The input color. This is assumed to be in the format [r, g, b]
         
         Returns
         -------
@@ -271,12 +271,12 @@ class Color:
             return None
         color = [int(x) for x in color if isinstance(x, numbers.Real)]
         if len(color) < 3:
-            print("Color.CSSNamedColor - Error: The input color parameter does not contain valid r,g,b values. Returning None.")
+            print("Color.CSSNamedColor - Error: The input color parameter does not contain valid r, g, b values. Returning None.")
             return None
         color = color[0:3]
         for x in color:
             if not (0 <= x <= 255):
-                print("Color.CSSNamedColor - Error: The input color parameter does not contain valid r,g,b values. Returning None.")
+                print("Color.CSSNamedColor - Error: The input color parameter does not contain valid r, g, b values. Returning None.")
                 return None
 
         def est_color(requested_color):
@@ -336,12 +336,12 @@ class Color:
     @staticmethod
     def PlotlyColor(color, alpha=1.0, useAlpha=False):
         """
-        Returns a plotly color string based on the input list of [r,g,b] or [r,g,b,a]. If your list is [r,g,b], you can optionally specify an alpha value
+        Returns a plotly color string based on the input list of [r, g, b] or [r, g, b, a]. If your list is [r, g, b], you can optionally specify an alpha value
 
         Parameters
         ----------
         color : list
-            The input color list. This is assumed to be in the format [r,g,b] or [r,g,b,a]
+            The input color list. This is assumed to be in the format [r, g, b] or [r, g, b, a]
         alpha : float , optional
             The transparency value. 0.0 means the color is fully transparent, 1.0 means the color is fully opaque. The default is 1.0.
         useAlpha : bool , optional

topologicpy/Edge.py

@@ -696,7 +696,7 @@ class Edge(Topology):
         Parameters
         ----------
         origin : topologic.Vertex , optional
-            The origin location of the box. The default is None which results in the edge being placed at (0,0,0).
+            The origin location of the box. The default is None which results in the edge being placed at (0, 0, 0).
         length : float , optional
             The desired length of the edge. The default is 1.0.
         direction : list , optional
@@ -751,7 +751,7 @@ class Edge(Topology):
             return None
     
     @staticmethod
-    def Normal(edge: topologic.Edge, degree: float=0.0):
+    def Normal(edge: topologic.Edge, angle: float = 0.0):
         """
         Returns the normal (perpendicular) vector to the input edge.
 
@@ -759,6 +759,9 @@ class Edge(Topology):
         ----------
         edge : topologic.Edge
             The input edge.
+        angle : float , optional
+            The desired rotational offset angle in degrees for the normal edge. This rotates the normal edge
+            by the angle value around the axis defined by the input edge. The default is 0.0.
 
         Returns
         -------
@@ -769,11 +772,11 @@ class Edge(Topology):
         if not isinstance(edge, topologic.Edge):
             print("Edge.Normal - Error: The input edge parameter is not a valid edge. Returning None.")
             return None
-        normal_edge = Edge.NormalAsEdge(edge, length=1.0, u=0.5, degree=degree)
+        normal_edge = Edge.NormalAsEdge(edge, length=1.0, u=0.5, angle=angle)
         return Edge.Direction(normal_edge)
 
     @staticmethod
-    def NormalAsEdge(edge: topologic.Edge, length: float=1.0, u: float=0.5, degree: float=0.0):
+    def NormalAsEdge(edge: topologic.Edge, length: float = 1.0, u: float = 0.5, angle: float = 0.0):
         """
         Returns the normal (perpendicular) vector to the input edge as an edge.
 
@@ -788,14 +791,14 @@ class Edge(Topology):
             at the start vertex of the input edge, a value of 0.5 places the normal edge
             at the midpoint of the input edge, and a value of 1.0 places the normal edge
             at the end vertex of the input edge. The default is 0.5
-        degree : float , optional
-            The desired rotational offset in degrees for the normal edge. This rotates the normal edge
-            by the degree value around the axis defined by the input edge. The default is 0.0.
+        angle : float , optional
+            The desired rotational offset angle in degrees for the normal edge. This rotates the normal edge
+            by the angle value around the axis defined by the input edge. The default is 0.0.
 
         Returns
         -------
         topologic.Edge
-            The normal (perpendicular ) vector to the input edge as an edge.
+            The normal (perpendicular) vector to the input edge as an edge.
 
         """
         import numpy as np
@@ -844,7 +847,7 @@ class Edge(Topology):
         ev = Vertex.ByCoordinates(list(normal_line_end))
         normal_edge = Edge.ByVertices([sv, ev])
         normal_edge = Edge.SetLength(normal_edge, length, bothSides=False)
-        normal_edge = Topology.Rotate(normal_edge, Edge.StartVertex(normal_edge), x=x, y=y, z=z, degree=degree)
+        normal_edge = Topology.Rotate(normal_edge, origin=Edge.StartVertex(normal_edge), axis=[x,y,z], angle=angle)
         dist = Edge.Length(edge)*u
         normal_edge = Topology.TranslateByDirectionDistance(normal_edge, edge_direction, dist)
         return normal_edge