topologicpy 0.4.38__py3-none-any.whl → 0.4.40__py3-none-any.whl

topologicpy/Topology.py

@@ -1280,26 +1280,6 @@ class Topology():
             return None
         return Topology.ByBREPFile(file)
     
-    @staticmethod
-    def ByImportedBRep(path):
-        """
-        DEPRECATED. DO NOT USE. Instead use Topology.ByBREPPath or Topology.ByBREPFile
-        IMportes a topology from a BRep file path.
-
-        Parameters
-        ----------
-        path : str
-            The path to the BRep file.
-
-        Returns
-        -------
-        topologic.Topology
-            The imported topology.
-
-        """
-        print("Topology.ByImportedBRep - WARNING: This method is DEPRECATED. DO NOT USE. Instead use Topology.ByBREPPath or Topology.ByBREPFile")
-        return Topology.ByBREPPath(path=path)
-    
     @staticmethod
     def ByIFCFile(file, transferDictionaries=False):
         """
@@ -1422,28 +1402,6 @@ class Topology():
             print("Topology.ByIFCPath - Error: the input file is not a valid file. Returning None.")
             return None
         return Topology.ByIFCFile(file, transferDictionaries=transferDictionaries)
-        
-    @staticmethod
-    def ByImportedIFC(path, transferDictionaries=False):
-        """
-        DEPRECATED. DO NOT USE. Instead use Topology.ByIFCPath or Topology.ByIFCFile
-        Create a topology by importing it from an IFC file path.
-
-        Parameters
-        ----------
-        path : str
-            The path to the IFC file.
-        transferDictionaries : bool , optional
-            If set to True, the dictionaries from the IFC file will be transfered to the topology. Otherwise, they won't. The default is False.
-        
-        Returns
-        -------
-        list
-            The created list of topologies.
-        
-        """
-        print("Topology.ByImportedIFC - WARNING: This method is DEPRECATED. DO NOT USE. Instead use Topology.ByIFCPath or Topology.ByIFCFile")
-        return Topology.ByIFCPath(path=path, transferDictionaries=transferDictionaries)
     
     '''
     @staticmethod
@@ -1471,7 +1429,7 @@ class Topology():
         url = '/dns/'+url+'/tcp/'+port+'/https'
         client = ipfshttpclient.connect(url)
         brepString = client.cat(hash_).decode("utf-8")
-        topology = Topology.ByString(brepString)
+        topology = Topology.ByBREPString(brepString)
         return topology
     '''
     @staticmethod
@@ -1892,12 +1850,10 @@ class Topology():
         if not path:
             print("Topology.ByJSONPath - Error: the input path is not a valid path. Returning None.")
             return None
-        try:
-            file = open(path)
-        except:
-            print("Topology.ByJSONPath - Error: the JSON file is not a valid file. Returning None.")
-            return None
-        return Topology.ByJSONFile(file=file, tolerance=tolerance)
+        data = None
+        with open(path) as file:
+            data = Topology.ByJSONFile(file=file, tolerance=tolerance)
+        return data
 
     @staticmethod
     def ByOBJString(string, transposeAxes = True, progressBar=False, renderer="notebook", tolerance=0.0001):
@@ -2031,30 +1987,6 @@ class Topology():
             print("Topology.ByOBJPath - Error: the OBJ file is not a valid file. Returning None.")
             return None
         return Topology.ByOBJFile(file, transposeAxes=transposeAxes, progressBar=progressBar, renderer=renderer, tolerance=tolerance)
-    
-    @staticmethod
-    def ByImportedOBJ(path, transposeAxes = True, progressBar=False, renderer="notebook", tolerance=0.0001):
-        """
-        DEPRECATED. DO NOT USE. Instead use Topology.ByOBJPath or Topology.ByOBJFile
-        Imports the topology from a Weverfront OBJ file path. This is a very experimental method and only works with simple planar solids. Materials and Colors are ignored.
-
-        Parameters
-        ----------
-        path : str
-            The file path to the OBJ file.
-        transposeAxes : bool , optional
-            If set to True the Z and Y coordinates are transposed so that Y points "up" 
-        tolerance : float , optional
-            The desired tolerance. The default is 0.0001.
-
-        Returns
-        -------
-        topology
-            The imported topology.
-
-        """
-        print("Topology.ByImportedOBJ - WARNING: This method is DEPRECATED. DO NOT USE. Instead use Topology.ByOBJPath or Topology.ByOBJFile")
-        return Topology.ByOBJPath(path, transposeAxes=transposeAxes, progressBar=progressBar, renderer=renderer, tolerance=tolerance)
 
     @staticmethod
     def ByOCCTShape(occtShape):
@@ -2074,33 +2006,6 @@ class Topology():
         """
         return topologic.Topology.ByOcctShape(occtShape, "")
     
-    @staticmethod
-    def ByString(string):
-        """
-        DEPRECATED! Do not Use. Use ByBREPString instead.
-
-        Parameters
-        ----------
-        string : str
-            The input brep string.
-
-        Returns
-        -------
-        topologic.Topology
-            The created topology.
-
-        """
-        print("WARNING! Topology.ByString method is DEPRECATED. Do NOT use. Instead use Topology.ByBREPString.")
-        if not isinstance(string, str):
-            print("Topology.ByString - Error: the input string is not a valid string. Returning None.")
-            return None
-        returnTopology = None
-        try:
-            returnTopology = topologic.Topology.ByString(string)
-        except:
-            returnTopology = None
-        return returnTopology
-    
     @staticmethod
     def ByBREPString(string):
         """
@@ -2820,32 +2725,6 @@ class Topology():
             newTopology = Topology.Translate(aTopology, xT, yT, zT)
             newTopologies.append(newTopology)
         return Cluster.ByTopologies(newTopologies)
-
-    @staticmethod
-    def ExportToBRep(topology, path, overwrite=False, version=3):
-        """
-        DEPRECTATED. DO NOT USE. INSTEAD USE Topology.ExportToBREP.
-        Exports the input topology to a BREP file. See https://dev.opencascade.org/doc/occt-6.7.0/overview/html/occt_brep_format.html.
-
-        Parameters
-        ----------
-        topology : topologic.Topology
-            The input topology.
-        path : str
-            The input file path.
-        overwrite : bool , optional
-            If set to True the ouptut file will overwrite any pre-existing file. Otherwise, it won't. The default is False.
-        version : int , optional
-            The desired version number for the BREP file. The default is 3.
-
-        Returns
-        -------
-        bool
-            True if the export operation is successful. False otherwise.
-
-        """
-        print("Topology.ExportToBRep - WARNING: This method is deprecated. Please use instead Topology.ExportToBREP.")
-        return Topology.ExportToBREP(topology=topology, path=path, overwrite=overwrite, version=version)
     
     @staticmethod
     def ExportToBREP(topology, path, overwrite=False, version=3):
@@ -2892,7 +2771,7 @@ class Topology():
         except:
             raise Exception("Error: Could not create a new file at the following location: "+path)
         if (f):
-            s = topology.String(version)
+            s = Topology.BREPString(topology, version)
             f.write(s)
             f.close()    
             return True
@@ -2939,7 +2818,7 @@ class Topology():
             except:
                 raise Exception("Error: Could not create a new file at the following location: "+path)
             if (f):
-                topString = topology.String()
+                topString = topology.BREPString()
                 f.write(topString)
                 f.close()	
                 return True
@@ -4115,7 +3994,7 @@ class Topology():
         try:
             newTopology = Topology.Translate(topology, x, y, z)
         except:
-            print("ERROR: (Topologic>TopologyUtility.Place) operation failed. Returning None.")
+            print("Topology.Place - ERROR: (Topologic>TopologyUtility.Place) operation failed. Returning None.")
             newTopology = None
         return newTopology
     
@@ -4669,7 +4548,7 @@ class Topology():
         return new_topology
 
     @staticmethod
-    def Rotate(topology, origin=None, x=0, y=0, z=1, degree=0):
+    def Rotate(topology, origin=None, x=0, y=0, z=1, degree=0, angTolerance=0.001):
         """
         Rotates the input topology
 
@@ -4687,6 +4566,8 @@ class Topology():
             The 'z' component of the rotation axis. The default is 0.
         degree : float , optional
             The angle of rotation in degrees. The default is 0.
+        angTolerance : float , optional
+            The angle tolerance in degrees under which no rotation is carried out. The default is 0.001 degrees.
 
         Returns
         -------
@@ -4695,13 +4576,21 @@ class Topology():
 
         """
         from topologicpy.Vertex import Vertex
+        from topologicpy.Topology import Topology
         if not isinstance(topology, topologic.Topology):
             return None
         if not origin:
             origin = Vertex.ByCoordinates(0,0,0)
         if not isinstance(origin, topologic.Vertex):
             return None
-        return topologic.TopologyUtility.Rotate(topology, origin, x, y, z, degree)
+        returnTopology = topology
+        if abs(degree) >= angTolerance:
+            try:
+                returnTopology = topologic.TopologyUtility.Rotate(topology, origin, x, y, z, degree)
+            except:
+                print("Topology.Rotate - Error: (topologic.TopologyUtility.Rotate) operation failed. Returning None.")
+                return None
+        return returnTopology
     
     @staticmethod
     def Scale(topology, origin=None, x=1, y=1, z=1):
@@ -4738,7 +4627,7 @@ class Topology():
         try:
             newTopology = topologic.TopologyUtility.Scale(topology, origin, x, y, z)
         except:
-            print("ERROR: (Topologic>TopologyUtility.Scale) operation failed. Returning None.")
+            print("Topology.Scale - ERROR: (Topologic>TopologyUtility.Scale) operation failed. Returning None.")
             newTopology = None
         return newTopology
 
@@ -5346,7 +5235,9 @@ class Topology():
         topologies = []
         unit_degree = degree / float(sides)
         for i in range(sides+1):
-            topologies.append(topologic.TopologyUtility.Rotate(topology, origin, direction[0], direction[1], direction[2], unit_degree*i))
+            tempTopology = Topology.Rotate(topology, origin, direction[0], direction[1], direction[2], unit_degree*i)
+            if tempTopology:
+                topologies.append(tempTopology)
         returnTopology = None
         if topology.Type() == topologic.Vertex.Type():
             returnTopology = Wire.ByVertices(topologies, False)
@@ -5437,31 +5328,15 @@ class Topology():
         if not isinstance(topology, topologic.Topology):
             print("Topology.BREPString - Error: the input topology is not a valid topology. Returning None.")
             return None
-        return topologic.Topology.String(topology, version)
-    
-    @staticmethod
-    def String(topology, version=3):
-        """
-        DEPRECATED. Do not use. Instead use BREPString.
-
-        Parameters
-        ----------
-        topology : topologic.Topology
-            The input topology.
-        version : int , optional
-            The desired BRep version number. The default is 3.
-
-        Returns
-        -------
-        str
-            The BRep string.
-
-        """
-        print("WARNING! Topology.String is deprecated. Do not use. Instead use Topology.BREPString")
-        if not isinstance(topology, topologic.Topology):
-            print("Topology.String - Error: the input topology is not a valid topology. Returning None.")
-            return None
-        return topologic.Topology.String(topology, version)
+        st = None
+        try:
+            st = topologic.Topology.String(topology, version)
+        except:
+            try:
+                st = topologic.Topology.BREPString(topology, version)
+            except:
+                st = None
+        return st
     
     @staticmethod
     def Vertices(topology):

topologicpy/Vertex.py

@@ -296,9 +296,9 @@ class Vertex(Topology):
         return vertices
     
     @staticmethod
-    def Distance(vertex: topologic.Vertex, topology: topologic.Topology, mantissa: int = 4) -> float:
+    def Distance(vertex: topologic.Vertex, topology: topologic.Topology, includeCentroid: bool =True, mantissa: int = 4) -> float:
         """
-        Returns the distance between the input vertex and the input topology.
+        Returns the distance between the input vertex and the input topology. This method returns the distance to the closest sub-topology in the input topology, optionally including its centroid.
 
         Parameters
         ----------
@@ -306,6 +306,8 @@ class Vertex(Topology):
             The input vertex.
         topology : topologic.Topology
             The input topology.
+        includeCentroid : bool
+            If set to True, the centroid of the input topology will be considered in finding the nearest subTopology to the input vertex. The default is True.
         mantissa: int , optional
             The desired length of the mantissa. The default is 4.
 
@@ -315,9 +317,126 @@ class Vertex(Topology):
             The distance between the input vertex and the input topology.
 
         """
+        import numpy as np
+        from topologicpy.Edge import Edge
+        from topologicpy.Wire import Wire
+        from topologicpy.Face import Face
+        from topologicpy.Shell import Shell
+        from topologicpy.Cell import Cell
+        from topologicpy.Cluster import Cluster
+
+        def distance_point_to_point(point1, point2):
+            # Convert input points to NumPy arrays
+            point1 = np.array(point1)
+            point2 = np.array(point2)
+            
+            # Calculate the Euclidean distance
+            distance = np.linalg.norm(point1 - point2)
+            
+            return distance
+
+        def distance_point_to_line(point, line_start, line_end):
+            # Convert input points to NumPy arrays for vector operations
+            point = np.array(point)
+            line_start = np.array(line_start)
+            line_end = np.array(line_end)
+            
+            # Calculate the direction vector of the edge
+            line_direction = line_end - line_start
+            
+            # Vector from the edge's starting point to the point
+            point_to_start = point - line_start
+            
+            # Calculate the parameter 't' where the projection of the point onto the edge occurs
+            t = np.dot(point_to_start, line_direction) / np.dot(line_direction, line_direction)
+            
+            # Check if 't' is outside the range [0, 1], and if so, calculate distance to closest endpoint
+            if t < 0:
+                return np.linalg.norm(point - line_start)
+            elif t > 1:
+                return np.linalg.norm(point - line_end)
+            
+            # Calculate the closest point on the edge to the given point
+            closest_point = line_start + t * line_direction
+            
+            # Calculate the distance between the closest point and the given point
+            distance = np.linalg.norm(point - closest_point)
+            
+            return distance
+
+        def distance_point_to_plane(point, plane_point, plane_normal):
+            # Convert input points and normal vector to NumPy arrays
+            point = np.array(point)
+            plane_point = np.array(plane_point)
+            plane_normal = np.array(plane_normal)
+            
+            # Calculate the vector from the plane point to the given point
+            point_to_plane = point - plane_point
+            
+            # Calculate the distance as the projection of the point-to-plane vector onto the plane's normal
+            distance = np.abs(np.dot(point_to_plane, plane_normal) / np.linalg.norm(plane_normal))
+            
+            return distance
+        
+        def distance_to_vertex(vertexA, vertexB):
+            a = (Vertex.X(vertexA), Vertex.Y(vertexA), Vertex.Z(vertexA))
+            b = (Vertex.X(vertexB), Vertex.Y(vertexB), Vertex.Z(vertexB))
+            return distance_point_to_point(a,b)
+        
+        def distance_to_edge(vertex, edge):
+            a = (Vertex.X(vertex), Vertex.Y(vertex), Vertex.Z(vertex))
+            sv = Edge.StartVertex(edge)
+            ev = Edge.EndVertex(edge)
+            svp = (Vertex.X(sv), Vertex.Y(sv), Vertex.Z(sv))
+            evp = (Vertex.X(ev), Vertex.Y(ev), Vertex.Z(ev))
+            return distance_point_to_line(a,svp, evp)
+        
+        def distance_to_face(vertex, face):
+            a = (Vertex.X(vertex), Vertex.Y(vertex), Vertex.Z(vertex))
+            c = Topology.Centroid(face)
+            c = (Vertex.X(c), Vertex.Y(c), Vertex.Z(c))
+            n = Face.Normal(face)
+            n = (n[0], n[1], n[2])
+            return distance_point_to_plane(a, c, n)
+        
         if not isinstance(vertex, topologic.Vertex) or not isinstance(topology, topologic.Topology):
             return None
-        return round(topologic.VertexUtility.Distance(vertex, topology), mantissa)
+        if isinstance(topology, topologic.Vertex):
+            return round(distance_to_vertex(vertex,topology), mantissa)
+        elif isinstance(topology, topologic.Edge):
+            return round(distance_to_edge(vertex,topology), mantissa)
+        elif isinstance(topology, topologic.Wire):
+            vertices = Topology.Vertices(topology)
+            distances = [distance_to_vertex(vertex, v) for v in vertices]
+            edges = Topology.Edges(topology)
+            distances += [distance_to_edge(vertex, e) for e in edges]
+            if includeCentroid:
+                distances.append(distance_to_vertex(vertex, Topology.Centroid(topology)))
+            return round(min(distances), mantissa)
+        elif isinstance(topology, topologic.Face):
+            vertices = Topology.Vertices(topology)
+            distances = [distance_to_vertex(vertex, v) for v in vertices]
+            edges = Topology.Edges(topology)
+            distances += [distance_to_edge(vertex, e) for e in edges]
+            distances.append(distance_to_face(vertex,topology))
+            if includeCentroid:
+                distances.append(distance_to_vertex(vertex, Topology.Centroid(topology)))
+            return round(min(distances), mantissa)
+        elif isinstance(topology, topologic.Shell) or isinstance(topology, topologic.Cell) or isinstance(topology, topologic.CellComplex) or isinstance(topology, topologic.Cluster):
+            vertices = Topology.Vertices(topology)
+            distances = [distance_to_vertex(vertex, v) for v in vertices]
+            edges = Topology.Edges(topology)
+            distances += [distance_to_edge(vertex, e) for e in edges]
+            faces = Topology.Faces(topology)
+            distances += [distance_to_face(vertex, f) for f in faces]
+            edges = Topology.Edges(topology)
+            distances += [distance_to_edge(vertex, e) for e in edges]
+            if includeCentroid:
+                distances.append(distance_to_vertex(vertex, Topology.Centroid(topology)))
+            return round(min(distances), mantissa)
+        else:
+            print("Vertex.Distance - Error: Could not recognize the input topology. Returning None.")
+            return None
     
     @staticmethod
     def EnclosingCell(vertex: topologic.Vertex, topology: topologic.Topology, exclusive: bool = True, tolerance: float = 0.0001) -> list:
@@ -545,6 +664,7 @@ class Vertex(Topology):
 
         """
         from topologicpy.Wire import Wire
+        from topologicpy.Face import Face
         from topologicpy.Shell import Shell
         from topologicpy.CellComplex import CellComplex
         from topologicpy.Cluster import Cluster
@@ -555,7 +675,7 @@ class Vertex(Topology):
             return None
 
         if isinstance(topology, topologic.Vertex):
-            return topologic.VertexUtility.Distance(vertex, topology) < tolerance
+            return Vertex.Distance(vertex, topology) < tolerance
         elif isinstance(topology, topologic.Edge):
             try:
                 parameter = topologic.EdgeUtility.ParameterAtPoint(topology, vertex)
@@ -569,7 +689,7 @@ class Vertex(Topology):
                     return True
             return False
         elif isinstance(topology, topologic.Face):
-            return topologic.FaceUtility.IsInside(topology, vertex, tolerance)
+            return Face.IsInside(topology, vertex, tolerance)
         elif isinstance(topology, topologic.Shell):
             faces = Shell.Faces(topology)
             for face in faces:
@@ -813,16 +933,16 @@ class Vertex(Topology):
             return None
         if not direction:
             direction = Vector.Reverse(Face.NormalAtParameters(face, 0.5, 0.5, "XYZ", mantissa))
-        if topologic.FaceUtility.IsInside(face, vertex, tolerance):
+        if Face.IsInside(face, vertex, tolerance):
             return vertex
-        d = topologic.VertexUtility.Distance(vertex, face)*10
-        far_vertex = topologic.TopologyUtility.Translate(vertex, direction[0]*d, direction[1]*d, direction[2]*d)
-        if topologic.VertexUtility.Distance(vertex, far_vertex) > tolerance:
+        d = Vertex.Distance(vertex, face)*10
+        far_vertex = Topology.Translate(vertex, direction[0]*d, direction[1]*d, direction[2]*d)
+        if Vertex.Distance(vertex, far_vertex) > tolerance:
             e = topologic.Edge.ByStartVertexEndVertex(vertex, far_vertex)
             pv = face.Intersect(e, False)
             if not pv:
-                far_vertex = topologic.TopologyUtility.Translate(vertex, -direction[0]*d, -direction[1]*d, -direction[2]*d)
-                if topologic.VertexUtility.Distance(vertex, far_vertex) > tolerance:
+                far_vertex = Topology.Translate(vertex, -direction[0]*d, -direction[1]*d, -direction[2]*d)
+                if Vertex.Distance(vertex, far_vertex) > tolerance:
                     e = topologic.Edge.ByStartVertexEndVertex(vertex, far_vertex)
                     pv = face.Intersect(e, False)
             return pv

topologicpy/Wire.py

@@ -504,6 +504,8 @@ class Wire(topologic.Wire):
             The created circle.
 
         """
+        from topologicpy.Topology import Topology
+
         if not origin:
             origin = topologic.Vertex.ByCoordinates(0,0,0)
         if not isinstance(origin, topologic.Vertex):
@@ -540,13 +542,13 @@ class Wire(topologic.Wire):
         baseWire = Wire.ByVertices(baseV[::-1], close) #reversing the list so that the normal points up in Blender
 
         if placement.lower() == "lowerleft":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, radius, radius, 0)
+            baseWire = Topology.Translate(baseWire, radius, radius, 0)
         elif placement.lower() == "upperleft":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, radius, -radius, 0)
+            baseWire = Topology.Translate(baseWire, radius, -radius, 0)
         elif placement.lower() == "lowerright":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, -radius, radius, 0)
+            baseWire = Topology.Translate(baseWire, -radius, radius, 0)
         elif placement.lower() == "upperright":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, -radius, -radius, 0)
+            baseWire = Topology.Translate(baseWire, -radius, -radius, 0)
         x1 = origin.X()
         y1 = origin.Y()
         z1 = origin.Z()
@@ -562,8 +564,8 @@ class Wire(topologic.Wire):
             theta = 0
         else:
             theta = math.degrees(math.acos(dz/dist)) # Rotation around Z-Axis
-        baseWire = topologic.TopologyUtility.Rotate(baseWire, origin, 0, 1, 0, theta)
-        baseWire = topologic.TopologyUtility.Rotate(baseWire, origin, 0, 0, 1, phi)
+        baseWire = Topology.Rotate(baseWire, origin, 0, 1, 0, theta)
+        baseWire = Topology.Rotate(baseWire, origin, 0, 0, 1, phi)
         return baseWire
 
     @staticmethod
@@ -1012,6 +1014,8 @@ class Wire(topologic.Wire):
             8. "length" : The length
 
         """
+        from topologicpy.Topology import Topology
+
         if not origin:
             origin = topologic.Vertex.ByCoordinates(0,0,0)
         if not isinstance(origin, topologic.Vertex):
@@ -1086,7 +1090,7 @@ class Wire(topologic.Wire):
         ellipse = Wire.ByVertices(baseV[::-1], close) #reversing the list so that the normal points up in Blender
 
         if placement.lower() == "lowerleft":
-            ellipse = topologic.TopologyUtility.Translate(ellipse, a, b, 0)
+            ellipse = Topology.Translate(ellipse, a, b, 0)
         x1 = origin.X()
         y1 = origin.Y()
         z1 = origin.Z()
@@ -1102,17 +1106,17 @@ class Wire(topologic.Wire):
             theta = 0
         else:
             theta = math.degrees(math.acos(dz/dist)) # Rotation around Z-Axis
-        ellipse = topologic.TopologyUtility.Rotate(ellipse, origin, 0, 1, 0, theta)
-        ellipse = topologic.TopologyUtility.Rotate(ellipse, origin, 0, 0, 1, phi)
+        ellipse = Topology.Rotate(ellipse, origin, 0, 1, 0, theta)
+        ellipse = Topology.Rotate(ellipse, origin, 0, 0, 1, phi)
 
         # Create a Cluster of the two foci
         v1 = topologic.Vertex.ByCoordinates(c+origin.X(), 0+origin.Y(),0)
         v2 = topologic.Vertex.ByCoordinates(-c+origin.X(), 0+origin.Y(),0)
         foci = topologic.Cluster.ByTopologies([v1, v2])
         if placement.lower() == "lowerleft":
-            foci = topologic.TopologyUtility.Translate(foci, a, b, 0)
-        foci = topologic.TopologyUtility.Rotate(foci, origin, 0, 1, 0, theta)
-        foci = topologic.TopologyUtility.Rotate(foci, origin, 0, 0, 1, phi)
+            foci = Topology.Translate(foci, a, b, 0)
+        foci = Topology.Rotate(foci, origin, 0, 1, 0, theta)
+        foci = Topology.Rotate(foci, origin, 0, 0, 1, phi)
         d = {}
         d['ellipse'] = ellipse
         d['foci'] = foci
@@ -1417,7 +1421,8 @@ class Wire(topologic.Wire):
             A list of faces representing the isovist projection from the input viewpoint.
 
         """
-        
+        from topologicpy.Topology import Topology
+
         def vertexPartofFace(vertex, face, tolerance):
             vertices = []
             _ = face.Vertices(None, vertices)
@@ -1450,7 +1455,7 @@ class Wire(topologic.Wire):
             d = topologic.VertexUtility.Distance(viewPoint, aVertex)
             if d > tolerance:
                 scaleFactor = maxDistance/d
-                newV = topologic.TopologyUtility.Scale(aVertex, viewPoint, scaleFactor, scaleFactor, scaleFactor)
+                newV = Topology.Scale(aVertex, viewPoint, scaleFactor, scaleFactor, scaleFactor)
                 try:
                     ray = topologic.Edge.ByStartVertexEndVertex(viewPoint, newV)
                     topologyC = ray.Intersect(wire, False)
@@ -2122,7 +2127,9 @@ class Wire(topologic.Wire):
 
         """
         from topologicpy.Vertex import Vertex
+        from topologicpy.Topology import Topology
         import math
+
         if not origin:
             origin = topologic.Vertex.ByCoordinates(0,0,0)
         if not isinstance(origin, topologic.Vertex):
@@ -2192,15 +2199,15 @@ class Wire(topologic.Wire):
         radius = radiusA + radiusB*turns*0.5
         baseWire = Wire.ByVertices(vertices, close=False)
         if placement.lower() == "center":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, 0, 0, -height*0.5)
+            baseWire = Topology.Translate(baseWire, 0, 0, -height*0.5)
         if placement.lower() == "lowerleft":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, -minX, -minY, 0)
+            baseWire = Topology.Translate(baseWire, -minX, -minY, 0)
         elif placement.lower() == "upperleft":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, -minX, -maxY, 0)
+            baseWire = Topology.Translate(baseWire, -minX, -maxY, 0)
         elif placement.lower() == "lowerright":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, -maxX, -minY, 0)
+            baseWire = Topology.Translate(baseWire, -maxX, -minY, 0)
         elif placement.lower() == "upperright":
-            baseWire = topologic.TopologyUtility.Translate(baseWire, -maxX, -maxY, 0)
+            baseWire = Topology.Translate(baseWire, -maxX, -maxY, 0)
         x1 = origin.X()
         y1 = origin.Y()
         z1 = origin.Z()
@@ -2216,8 +2223,8 @@ class Wire(topologic.Wire):
             theta = 0
         else:
             theta = math.degrees(math.acos(dz/dist)) # Rotation around Z-Axis
-        baseWire = topologic.TopologyUtility.Rotate(baseWire, origin, 0, 1, 0, theta)
-        baseWire = topologic.TopologyUtility.Rotate(baseWire, origin, 0, 0, 1, phi)
+        baseWire = Topology.Rotate(baseWire, origin, 0, 1, 0, theta)
+        baseWire = Topology.Rotate(baseWire, origin, 0, 0, 1, phi)
         return baseWire
 
     @staticmethod
@@ -2352,6 +2359,7 @@ class Wire(topologic.Wire):
             The created star.
 
         """
+        from topologicpy.Topology import Topology
 
         if not origin:
             origin = topologic.Vertex.ByCoordinates(0,0,0)
@@ -2428,8 +2436,8 @@ class Wire(topologic.Wire):
             theta = 0
         else:
             theta = math.degrees(math.acos(dz/dist)) # Rotation around Y-Axis
-        baseWire = topologic.TopologyUtility.Rotate(baseWire, origin, 0, 1, 0, theta)
-        baseWire = topologic.TopologyUtility.Rotate(baseWire, origin, 0, 0, 1, phi)
+        baseWire = Topology.Rotate(baseWire, origin, 0, 1, 0, theta)
+        baseWire = Topology.Rotate(baseWire, origin, 0, 0, 1, phi)
         return baseWire
 
     @staticmethod
@@ -2464,6 +2472,8 @@ class Wire(topologic.Wire):
             The created trapezoid.
 
         """
+        from topologicpy.Topology import Topology
+
         if not origin:
             origin = topologic.Vertex.ByCoordinates(0,0,0)
         if not isinstance(origin, topologic.Vertex):
@@ -2514,8 +2524,8 @@ class Wire(topologic.Wire):
             theta = 0
         else:
             theta = math.degrees(math.acos(dz/dist)) # Rotation around Z-Axis
-        baseWire = topologic.TopologyUtility.Rotate(baseWire, origin, 0, 1, 0, theta)
-        baseWire = topologic.TopologyUtility.Rotate(baseWire, origin, 0, 0, 1, phi)
+        baseWire = Topology.Rotate(baseWire, origin, 0, 1, 0, theta)
+        baseWire = Topology.Rotate(baseWire, origin, 0, 0, 1, phi)
         return baseWire
 
     @staticmethod