topologicpy 0.7.93__py3-none-any.whl → 0.7.96__py3-none-any.whl

topologicpy/Shell.py

@@ -432,17 +432,17 @@ class Shell():
                     e3 = None
                     e4 = None
                     try:
-                        e3 = Edge.ByVertices([e1.StartVertex(), e2.StartVertex()], tolerance=tolerance, silent=silent)
+                        e3 = Edge.ByVertices([Edge.StartVertex(e1), Edge.StartVertex(e2)], tolerance=tolerance, silent=silent)
                     except:
-                        e4 = Edge.ByVertices([e1.EndVertex(), e2.EndVertex()], tolerance=tolerance, silent=silent)
+                        e4 = Edge.ByVertices([Edge.EndVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=silent)
                         faces.append(Face.ByWire(Wire.ByEdges([e1, e2, e4], tolerance=tolerance), tolerance=tolerance))
                     try:
-                        e4 = Edge.ByVertices([e1.EndVertex(), e2.EndVertex()], tolerance=tolerance, silent=silent)
+                        e4 = Edge.ByVertices([Edge.EndVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=silent)
                     except:
-                        e3 = Edge.ByVertices([e1.StartVertex(), e2.StartVertex()], tolerance=tolerance, silent=silent)
+                        e3 = Edge.ByVertices([Edge.StartVertex(e1), Edge.StartVertex(e2)], tolerance=tolerance, silent=silent)
                         faces.append(Face.ByWire(Wire.ByEdges([e1, e2, e3],tolerance=tolerance), tolerance=tolerance))
                     if e3 and e4:
-                        e5 = Edge.ByVertices([e1.StartVertex(), e2.EndVertex()], tolerance=tolerance, silent=silent)
+                        e5 = Edge.ByVertices([Edge.StartVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=silent)
                         faces.append(Face.ByWire(Wire.ByEdges([e1, e5, e4], tolerance=tolerance), tolerance=tolerance))
                         faces.append(Face.ByWire(Wire.ByEdges([e2, e5, e3], tolerance=tolerance), tolerance=tolerance))
                     elif e3:
@@ -470,17 +470,17 @@ class Shell():
                     e3 = None
                     e4 = None
                     try:
-                        e3 = Edge.ByVertices([e1.StartVertex(), e2.StartVertex()], tolerance=tolerance, silent=silent)
+                        e3 = Edge.ByVertices([Edge.StartVertex(e1), Edge.StartVertex(e2)], tolerance=tolerance, silent=silent)
                     except:
                         try:
-                            e4 = Edge.ByVertices([e1.EndVertex(), e2.EndVertex()], tolerance=tolerance, silent=silent)
+                            e4 = Edge.ByVertices([Edge.EndVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=silent)
                         except:
                             pass
                     try:
-                        e4 = Edge.ByVertices([e1.EndVertex(), e2.EndVertex()], tolerance=tolerance, silent=silent)
+                        e4 = Edge.ByVertices([Edge.EndVertex(e1), Edge.EndVertex(e2)], tolerance=tolerance, silent=silent)
                     except:
                         try:
-                            e3 = Edge.ByVertices([e1.StartVertex(), e2.StartVertex()], tolerance=tolerance, silent=silent)
+                            e3 = Edge.ByVertices([Edge.StartVertex(e1), Edge.StartVertex(e2)], tolerance=tolerance, silent=silent)
                         except:
                             pass
                     if e3 and e4:

topologicpy/Topology.py

@@ -4145,7 +4145,7 @@ class Topology():
         if not Topology.IsInstance(topology, "Topology"):
             print("Topology.CenterofMass - Error: the input topology parameter is not a valid topology. Returning None.")
             return None
-        return topology.CenterOfMass()
+        return topology.CenterOfMass() # Hook to Core
     
     @staticmethod
     def Centroid(topology):
@@ -4169,8 +4169,8 @@ class Topology():
             print("Topology.Centroid - Error: the input topology parameter is not a valid topology. Returning None.")
             return None
         if Topology.IsInstance(topology, "Aperture"):
-            return Aperture.Topology(topology).Centroid()
-        return topology.Centroid()
+            return Aperture.Topology(topology).Centroid() # Hook to Core
+        return topology.Centroid() # Hook to Core
 
     @staticmethod
     def ClusterByKeys(topologies, *keys, silent=False):
@@ -6140,6 +6140,7 @@ class Topology():
 
         """
         from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
         from topologicpy.Face import Face
 
         vertices = []
@@ -6164,8 +6165,8 @@ class Topology():
             topEdges = Topology.Edges(topology)
         for anEdge in topEdges:
             e = []
-            sv = anEdge.StartVertex()
-            ev = anEdge.EndVertex()
+            sv = Edge.StartVertex(anEdge)
+            ev = Edge.EndVertex(anEdge)
             try:
                 svIndex = vertices.index(Vertex.Coordinates(sv, mantissa=mantissa))
             except:

topologicpy/Vertex.py

@@ -1728,11 +1728,13 @@ class Vertex():
             The X coordinate of the input vertex.
 
         """
-        from topologicpy.Topology import Topology
-
-        if not Topology.IsInstance(vertex, "Vertex"):
-            return None
-        return round(vertex.X(), mantissa)
+        try:
+            return round(vertex.X(), mantissa) # Hook to Core
+        except:
+            try:
+                return round(vertex.x(), mantissa) # Hook to Core
+            except:
+                return None
 
     @staticmethod
     def Y(vertex, mantissa: int = 6) -> float:
@@ -1752,11 +1754,13 @@ class Vertex():
             The Y coordinate of the input vertex.
 
         """
-        from topologicpy.Topology import Topology
-
-        if not Topology.IsInstance(vertex, "Vertex"):
-            return None
-        return round(vertex.Y(), mantissa)
+        try:
+            return round(vertex.Y(), mantissa) # Hook to Core
+        except:
+            try:
+                return round(vertex.y(), mantissa) # Hook to Core
+            except:
+                return None
 
     @staticmethod
     def Z(vertex, mantissa: int = 6) -> float:
@@ -1776,9 +1780,11 @@ class Vertex():
             The Z coordinate of the input vertex.
 
         """
-        from topologicpy.Topology import Topology
-
-        if not Topology.IsInstance(vertex, "Vertex"):
-            return None
-        return round(vertex.Z(), mantissa)
+        try:
+            return round(vertex.Z(), mantissa) # Hook to Core
+        except:
+            try:
+                return round(vertex.z(), mantissa) # Hook to Core
+            except:
+                return None