topologicpy 0.7.66__py3-none-any.whl → 0.7.68__py3-none-any.whl

topologicpy/Plotly.py

@@ -370,6 +370,7 @@ class Plotly:
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Topology import Topology
         from topologicpy.Graph import Graph
+        from topologicpy.Color import Color
         import plotly.graph_objs as go
 
         if not Topology.IsInstance(graph, "Graph"):
@@ -377,6 +378,7 @@ class Plotly:
         v_labels = []
         v_groupList = []
         data = []
+        
         if showVertices:
             vertices = Graph.Vertices(graph)
             if vertexLabelKey or vertexGroupKey:
@@ -454,7 +456,7 @@ class Plotly:
                     if Topology.IsInstance(arc, "Wire"):
                         arc_edges = Topology.Edges(arc)
                         for arc_edge in arc_edges:
-                            arc_edge = Topology.SetDictionary(arc_edge, d, silent=silent)
+                            arc_edge = Topology.SetDictionary(arc_edge, d, silent=True)
                             new_edges.append(arc_edge)
                     else:
                         new_edges.append(edge)
@@ -473,9 +475,14 @@ class Plotly:
                     d = Topology.Dictionary(e)
                     if d:
                         if not edgeLabelKey == None:
-                            e_label = str(Dictionary.ValueAtKey(d, key=edgeLabelKey)) or ""
+                            e_label = str(Dictionary.ValueAtKey(d, key=edgeLabelKey))
+                            if e_label == None:
+                                e_label = ""
                         if not edgeGroupKey == None:
-                            e_group = str(Dictionary.ValueAtKey(d, key=edgeGroupKey)) or ""
+                            if edgeGroupKey:
+                                e_group = Dictionary.ValueAtKey(d, key=edgeGroupKey)
+                                if e_group == None:
+                                    e_group = ""
                     try:
                         e_groupList.append(edgeGroups.index(e_group))
                     except:
@@ -491,6 +498,7 @@ class Plotly:
                     Ye+=[Vertex.Y(sv, mantissa=mantissa), Vertex.Y(ev, mantissa=mantissa), None] # y-coordinates of edge ends
                     Ze+=[Vertex.Z(sv, mantissa=mantissa), Vertex.Z(ev, mantissa=mantissa), None] # z-coordinates of edge ends
 
+
             if len(list(set(e_groupList))) < 2:
                 e_groupList = edgeColor
             if len(e_labels) < 1:
@@ -500,6 +508,19 @@ class Plotly:
                 mode = "lines+text"
             else:
                 mode = "lines"
+            
+            final_categories = edgeColor # Start with the default edgeColor
+            if len(edgeGroups) > 0:
+                # Normalize categories to a range between 0 and 1 for the color scale
+                min_category = 0
+                max_category = max(len(edgeGroups), 1)
+                normalized_categories = [(cat - min_category) / (max_category - min_category) for cat in e_groupList]
+
+                final_categories = []
+                for c in normalized_categories:
+                    color = Color.ByValueInRange(c, minValue=0, maxValue=1, colorScale=colorScale)
+                    color = "rgb("+str(color[0])+","+str(color[1])+","+str(color[2])+")"
+                    final_categories.append(color)
             e_trace=go.Scatter3d(x=Xe,
                                  y=Ye,
                                  z=Ze,
@@ -508,12 +529,12 @@ class Plotly:
                                  legendgroup=5,
                                  legendrank=5,
                                  showlegend=showEdgeLegend,
-                                 line=dict(color=e_groupList, width=edgeWidth),
+                                 line=dict(color=final_categories, colorscale=Plotly.ColorScale(colorScale), cmin=0, cmax=1, width=edgeWidth),
                                  text=e_labels,
                                  hoverinfo='text'
                                 )
             data.append(e_trace)
-
+        
         return data
 
     @staticmethod
@@ -932,6 +953,8 @@ class Plotly:
         data = []
         v_list = []
         
+        if not isinstance(colorScale, str):
+            colorScale = "viridis"
         if Topology.Type(topology) == Topology.TypeID("Vertex"):
             tp_vertices = [topology]
         else:
@@ -1020,7 +1043,7 @@ class Plotly:
                                 d = Topology.Dictionary(tp_face)
                                 f_dictionaries.append(d)
                                 if d:
-                                    _ = Topology.SetDictionary(tri, d)
+                                    tri = Topology.SetDictionary(tri, d)
                             all_triangles.append(tri)
                 if len(all_triangles) > 0:
                     f_cluster = Cluster.ByTopologies(all_triangles)

topologicpy/Shell.py

@@ -182,7 +182,7 @@ class Shell():
 
             shell = Topology.Slice(internalBoundary, skeleton_cluster, tolerance=tolerance)
             if mergeJunctions == True:
-                vertices = Shell.Vertices(shell)
+                vertices = Topology.Vertices(shell)
                 centers = []
                 used = []
                 for v in vertices:
@@ -264,7 +264,7 @@ class Shell():
                     s = Topology.InternalVertex(f, tolerance=tolerance)
                     s = Topology.SetDictionary(s, d)
                     selectors.append(s)
-                _ = Topology.TransferDictionariesBySelectors(topology=shell, selectors=selectors, tranFaces=True, tolerance=tolerance)
+                shell = Topology.TransferDictionariesBySelectors(topology=shell, selectors=selectors, tranFaces=True, tolerance=tolerance)
             return shell
         return None
 
@@ -330,8 +330,7 @@ class Shell():
 
         if not Topology.IsInstance(cluster, "Cluster"):
             return None
-        faces = []
-        _ = cluster.Faces(None, faces)
+        faces = Topology.Faces(cluster)
         return Shell.ByFaces(faces, tolerance=tolerance)
 
     @staticmethod
@@ -619,7 +618,7 @@ class Shell():
             origin = Topology.Centroid(face)
             normal = Face.Normal(face, mantissa=mantissa)
             flatFace = Topology.Flatten(face, origin=origin, direction=normal)
-            faceVertices = Face.Vertices(face)
+            faceVertices = Topology.Vertices(face)
             vertices += faceVertices
 
             # Create a cluster of the input vertices
@@ -628,7 +627,7 @@ class Shell():
             # Flatten the cluster using the same transformations
             verticesCluster = Topology.Flatten(verticesCluster, origin=origin, direction=normal)
 
-            vertices = Cluster.Vertices(verticesCluster)
+            vertices = Topology.Vertices(verticesCluster)
         points = []
         for v in vertices:
             points.append([Vertex.X(v, mantissa=mantissa), Vertex.Y(v, mantissa=mantissa)])
@@ -682,7 +681,7 @@ class Shell():
         if not Topology.IsInstance(shell, "Shell"):
             return None
         edges = []
-        _ = shell.Edges(None, edges)
+        _ = shell.Edges(None, edges) # Hook to Core
         return edges
 
     @staticmethod
@@ -708,12 +707,10 @@ class Shell():
 
         if not Topology.IsInstance(shell, "Shell"):
             return None
-        edges = []
-        _ = shell.Edges(None, edges)
+        edges = Topology.Edges(shell)
         obEdges = []
         for anEdge in edges:
-            faces = []
-            _ = anEdge.Faces(shell, faces)
+            faces = Topology.SuperTopologies(anEdge, shell, topologyType="face")
             if len(faces) == 1:
                 obEdges.append(anEdge)
         return Topology.SelfMerge(Cluster.ByTopologies(obEdges), tolerance=tolerance)
@@ -1748,7 +1745,7 @@ class Shell():
             if isinstance(wire, list):
                 points = wire
             else:
-                points = Wire.Vertices(wire)
+                points = Topology.Vertices(wire)
                 # points.insert(0, points.pop())
             if len(points) <= 2:
                 return points
@@ -1937,7 +1934,7 @@ class Shell():
             points.append([Vertex.X(flatVertex, mantissa=mantissa), Vertex.Y(flatVertex, mantissa=mantissa)])
 
         br = Wire.BoundingRectangle(flatFace)
-        br_vertices = Wire.Vertices(br)
+        br_vertices = Topology.Vertices(br)
         br_x = []
         br_y = []
         for br_v in br_vertices: