topologicpy 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

topologicpy/Honeybee.py

@@ -98,7 +98,7 @@ class Honeybee:
     
     @staticmethod
     def ModelByTopology(tpBuilding,
-                tpShadingFacesCluster=None,
+                tpShadingFacesCluster = None,
                 buildingName = "Generic_Building",
                 defaultProgramIdentifier = "Generic Office Program",
                 defaultConstructionSetIdentifier = "Default Generic Construction Set",
@@ -106,12 +106,18 @@ class Honeybee:
                 heatingSetpoint = 20.0,
                 humidifyingSetpoint = 30.0,
                 dehumidifyingSetpoint = 55.0,
-                roomNameKey = "name",
-                roomTypeKey = "type",
-                apertureTypeKey = "type",
+                roomNameKey = "TOPOLOGIC_name",
+                roomTypeKey = "TOPOLOGIC_type",
+                apertureTypeKey = "TOPOLOGIC_type",
                 addSensorGrid = False):
         """
-        Creates an HB Model from the input Topology
+        Creates an HB Model from the input Topology.
+
+        Parameters
+        ----------
+
+
+        Returns
         -------
         HBModel
             The created HB Model

topologicpy/Plotly.py

@@ -13,6 +13,81 @@ from topologicpy.Topology import Topology
 import numpy as np
 
 class Plotly:
+    @staticmethod
+    def AddColorBar(figure, values=[], nTicks=5, xPosition=-0.15, width=15, outlineWidth=0, title="", subTitle="", units="", colorScale="viridis", mantissa=4):
+        """
+        Adds a color bar to the input figure
+
+        Parameters
+        ----------
+        figure : plotly.graph_objs._figure.Figure
+            The input plotly figure.
+        values : list , optional
+            The input list of values to use for the color bar. The default is [].
+        nTicks : int , optional
+            The number of ticks to use on the color bar. The default is 5.
+        xPosition : float , optional
+            The x location of the color bar. The default is -0.15.
+        width : int , optional
+            The width in pixels of the color bar. The default is 15
+        outlineWidth : int , optional
+            The width in pixels of the outline of the color bar. The default is 0.
+        title : str , optional
+            The title of the color bar. The default is "".
+        subTitle : str , optional
+            The subtitle of the color bar. The default is "".
+        units: str , optional
+            The units used in the color bar. The default is ""
+        colorScale : str , optional
+            The desired type of plotly color scales to use (e.g. "viridis", "plasma"). The default is "viridis". For a full list of names, see https://plotly.com/python/builtin-colorscales/.
+        mantissa : int , optional
+            The desired length of the mantissa for the values listed on the color bar. The default is 4.
+        Returns
+        -------
+        plotly.graph_objs._figure.Figure
+            The input figure with the color bar added.
+
+        """
+        if not isinstance(figure, plotly.graph_objs._figure.Figure):
+            return None
+        if units:
+            units = "Units: "+units
+        minValue = min(values)
+        maxValue = max(values)
+        step = (maxValue - minValue)/float(nTicks-1)
+        r = [round(minValue+i*step, mantissa) for i in range(nTicks)]
+        r[-1] = round(maxValue, mantissa)
+                # Define the minimum and maximum range of the colorbar
+        rs = [str(x) for x in r]
+
+        # Define the colorbar as a trace with no data, x or y coordinates
+        colorbar_trace = go.Scatter(
+            x=[0],
+            y=[0],
+            mode="markers",
+            showlegend=False,
+            marker=dict(
+                size=0,
+                colorscale=colorScale, # choose the colorscale
+                cmin=minValue,
+                cmax=maxValue,
+                color=['rgba(0,0,0,0)'],
+                colorbar=dict(
+                    x=xPosition,
+                    title="<b>"+title+"</b><br>"+subTitle+"<br>"+units, # title of the colorbar
+                    ticks="outside", # position of the ticks
+                    tickvals=r, # values of the ticks
+                    ticktext=rs, # text of the ticks
+                    tickmode="array",
+                    thickness=width,
+                    outlinewidth=outlineWidth,
+
+                )
+            )
+        )
+        figure.add_trace(colorbar_trace)
+        return figure
+    
     @staticmethod
     def Colors():
         """
@@ -283,7 +358,7 @@ class Plotly:
         return data
 
     @staticmethod
-    def DataByTopology(topology, vertexLabelKey=None, vertexGroupKey=None, edgeLabelKey=None, edgeGroupKey=None, faceLabelKey=None, faceGroupKey=None, vertexGroups=[], edgeGroups=[], faceGroups=[], faceColor="white", faceOpacity=0.5, edgeColor="black", edgeWidth=1, vertexColor="black", vertexSize=1.1, showFaces=True, showEdges=True, showVertices=True, vertexLabel="Topology Vertices", edgeLabel="Topology Edges", faceLabel="Topology Faces", vertexLegendGroup=1, edgeLegendGroup=2, faceLegendGroup=3, vertexLegendRank=1, edgeLegendRank=2, faceLegendRank=3, showVertexLegend=True, showEdgeLegend=True, showFaceLegend=True, intensityKey=None, colorScale="Viridis", showScale=True):
+    def DataByTopology(topology, vertexLabelKey=None, vertexGroupKey=None, edgeLabelKey=None, edgeGroupKey=None, faceLabelKey=None, faceGroupKey=None, vertexGroups=[], edgeGroups=[], faceGroups=[], faceColor="white", faceOpacity=0.5, edgeColor="black", edgeWidth=1, vertexColor="black", vertexSize=1.1, showFaces=True, showEdges=True, showVertices=True, vertexLabel="Topology Vertices", edgeLabel="Topology Edges", faceLabel="Topology Faces", vertexLegendGroup=1, edgeLegendGroup=2, faceLegendGroup=3, vertexLegendRank=1, edgeLegendRank=2, faceLegendRank=3, showVertexLegend=False, showEdgeLegend=False, showFaceLegend=False, intensityKey=None, colorScale="Viridis", showScale=True, scaleTitle="Untitled"):
         """
         Creates plotly face, edge, and vertex data.
 
@@ -316,8 +391,7 @@ class Plotly:
         vertexLegendRank : int , optional
             The legend rank order of the vertices of this topology. The default is 1.
         showVertexLegend : bool, optional
-            If set to True, the legend for the vertices of this topology is shown. Otherwise, it isn't. The default is True.
-        
+            If set to True, the legend for the vertices of this topology is shown. Otherwise, it isn't. The default is False.
         edgeGroupKey : str , optional
             The dictionary key to use to display the edge group. The default is None.
         edgeGroups : list , optional
@@ -332,7 +406,6 @@ class Plotly:
             The default is "black".
         edgeWidth : float , optional
             The desired thickness of the output edges. The default is 1.
-        
         edgeLabel : str , optional
             The legend label string used to identify edges. The default is "Topology Edges".
         edgeLabelKey : str , optional
@@ -342,7 +415,7 @@ class Plotly:
         edgeLegendRank : int , optional
             The legend rank order of the edges of this topology. The default is 2.
         showEdgeLegend : bool, optional
-            If set to True, the legend for the edges of this topology is shown. Otherwise, it isn't. The default is True.
+            If set to True, the legend for the edges of this topology is shown. Otherwise, it isn't. The default is False.
         showEdges : bool , optional
             If set to True the edges will be drawn. Otherwise, they will not be drawn. The default is True.
         faceLabelKey : str , optional
@@ -370,7 +443,7 @@ class Plotly:
         faceLegendRank : int , optional
             The legend rank order of the faces of this topology. The default is 3.
         showFaceLegend : bool, optional
-            If set to True, the legend for the faces of this topology is shown. Otherwise, it isn't. The default is True.
+            If set to True, the legend for the faces of this topology is shown. Otherwise, it isn't. The default is False.
         intensityKey: str, optional
             If not None, the dictionary of each vertex is searched for the value associated with the intensity key. This value is then used to color-code the vertex based on the colorScale. The default is None.
         colorScale : str , optional
@@ -504,7 +577,8 @@ class Plotly:
                                 hoverinfo='text')
 
 
-        def faceData(vertices, faces, dictionaries=None, faceColor="white", faceOpacity=0.5, faceLabelKey=None, faceGroupKey=None, faceGroups=[], faceLabel="Topology Faces", legendGroup=3, legendRank=3, showLegend=True, intensities=None, colorScale="Viridis", showScale="False", colorBarTitle=" "):
+        def faceData(vertices, faces, dictionaries=None, faceColor="white", faceOpacity=0.5, faceLabelKey=None, faceGroupKey=None, faceGroups=[], faceLabel="Topology Faces", legendGroup=3, legendRank=3, showLegend=True, intensities=None, colorScale="Viridis", showScale="False", scaleTitle="Untitled"):
+            from topologicpy.Color import Color
             x = []
             y = []
             z = []
@@ -517,7 +591,15 @@ class Plotly:
             k = []
             f_labels = []
             f_groupList = []
+            minGroup = 0
+            maxGroup = 100
             if faceLabelKey or faceGroupKey:
+                if faceGroups:
+                    minGroup = min(faceGroups)
+                    maxGroup = max(faceGroups)
+                else:
+                    minGroup = 0
+                    maxGroup = 1
                 for m, f in enumerate(faces):
                     i.append(f[0])
                     j.append(f[1])
@@ -532,11 +614,13 @@ class Plotly:
                             except:
                                 f_label = ""
                             try:
-                                f_group = str(Dictionary.ValueAtKey(d, key=faceGroupKey)) or ""
+                                f_group = Dictionary.ValueAtKey(d, key=faceGroupKey) or None
                             except:
-                                f_group = ""
+                                f_group = None
                         try:
-                            f_groupList.append(faceGroups.index(f_group))
+                            f_color = Color.ByValueInRange(f_group, minValue=minGroup, maxValue=maxGroup, colorScale=colorScale)
+                            colorString = "rgb("+str(f_color[0])+","+str(f_color[1])+","+str(f_color[2])+")"
+                            f_groupList.append(colorString)
                         except:
                             f_groupList.append(len(faceGroups))
                         if not f_label == "" and not f_group == "":
@@ -549,12 +633,10 @@ class Plotly:
                     k.append(f[2])
                 
             if len(list(set(f_groupList))) < 2:
-                    f_groupList = faceColor
+                f_groupList = None
             if len(f_labels) < 1:
                 f_labels = ""
-            if not colorBarTitle:
-                colorBarTitle = " "
-            return go.Mesh3d(
+            trace = go.Mesh3d(
                     x=x,
                     y=y,
                     z=z,
@@ -565,18 +647,22 @@ class Plotly:
                     showlegend = showLegend,
                     legendgroup = legendGroup,
                     legendrank = legendRank,
-                    color = f_groupList,
+                    color = faceColor,
+                    facecolor = f_groupList,
                     colorscale = colorScale,
-                    colorbar = {"x":-0.15, "title": "<b>"+colorBarTitle+"</b>"},
+                    #colorbar=dict(x=-0.15, thickness=15, outlinewidth=0, title= "<b>"+scaleTitle+"</b>"),
+                    #colorbar = {"x":-0.15, "title": "<b>"+scaleTitle+"</b>"},
                     intensity = intensities,
                     opacity = faceOpacity,
                     hoverinfo = 'text',
                     text=f_labels,
                     hovertext = f_labels,
                     flatshading = True,
-                    showscale = showScale,
+                    showscale = False,
                     lighting = {"facenormalsepsilon": 0},
                 )
+            return trace
+        
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
@@ -652,7 +738,7 @@ class Plotly:
                     i = Vertex.Index(vertex=w_v, vertices=tp_verts, tolerance=0.01)
                     temp_f.append(i)
                 faces.append(temp_f)
-            data.append(faceData(vertices, faces, dictionaries=f_dictionaries, faceColor=faceColor, faceOpacity=faceOpacity, faceLabelKey=faceLabelKey, faceGroupKey=faceGroupKey, faceGroups=faceGroups, faceLabel=faceLabel, legendGroup=faceLegendGroup, legendRank=faceLegendRank, showLegend=showFaceLegend, intensities=intensities, colorScale=colorScale, showScale=showScale, colorBarTitle=intensityKey))
+            data.append(faceData(vertices, faces, dictionaries=f_dictionaries, faceColor=faceColor, faceOpacity=faceOpacity, faceLabelKey=faceLabelKey, faceGroupKey=faceGroupKey, faceGroups=faceGroups, faceLabel=faceLabel, legendGroup=faceLegendGroup, legendRank=faceLegendRank, showLegend=showFaceLegend, intensities=intensities, colorScale=colorScale, showScale=showScale, scaleTitle=scaleTitle))
         return data
 
 
@@ -968,11 +1054,11 @@ class Plotly:
         import plotly.express as px
         
         if chartType.lower() == "line":
-            fig = px.line(dataFrame, x=labels[0], y=labels[1:], title=title, markers=useMarkers)
+            figure = px.line(dataFrame, x=labels[0], y=labels[1:], title=title, markers=useMarkers)
         elif chartType.lower() == "bar":
-            fig = px.bar(dataFrame, x=labels[0], y=labels[1:], title=title)
+            figure = px.bar(dataFrame, x=labels[0], y=labels[1:], title=title)
         elif chartType.lower() == "scatter":
-            fig = px.scatter(dataFrame, x=labels[0], y=labels[1:], title=title)
+            figure = px.scatter(dataFrame, x=labels[0], y=labels[1:], title=title)
         else:
             raise NotImplementedError
         
@@ -986,8 +1072,8 @@ class Plotly:
             "plot_bgcolor": backgroundColor,
             "margin":dict(l=marginLeft, r=marginRight, t=marginTop, b=marginBottom)
         }
-        fig.update_layout(layout)
-        return fig
+        figure.update_layout(layout)
+        return figure
 
 
     @staticmethod
@@ -1076,7 +1162,8 @@ class Plotly:
             plot_bgcolor=backgroundColor,
             margin=dict(l=marginLeft, r=marginRight, t=marginTop, b=marginBottom),
             )
-        #figure.data[2].colorbar.x=-0.1
+        figure.update_xaxes(showgrid=False, zeroline=False, visible=False)
+        figure.update_yaxes(showgrid=False, zeroline=False, visible=False)
         return figure
 
     @staticmethod

topologicpy/Topology.py

@@ -3947,11 +3947,254 @@ class Topology():
                 returnTopology = topologic.Cluster.ByTopologies(faces, False)
         return returnTopology
 
+    @staticmethod
+    def RemoveEdges(topology, edges=[]):
+        """
+        Removes the input list of faces from the input topology
+
+        Parameters
+        ----------
+        topology : topologic.Topology
+            The input topology.
+        edges : list
+            The input list of edges.
+
+        Returns
+        -------
+        topologic.Topology
+            The input topology with the input list of edges removed.
+
+        """
+
+        from topologicpy.Cluster import Cluster
+        if not isinstance(topology, topologic.Topology):
+            return None
+        edges = [e for e in edges if isinstance(e, topologic.Edge)]
+        if len(edges) < 1:
+            return topology
+        t_edges = Topology.Edges(topology)
+        t_faces = Topology.Faces(topology)
+        if len(t_edges) < 1:
+            return topology
+        if len(t_faces) > 0:
+            remove_faces = []
+            for t_e in t_edges:
+                remove = False
+                for i, e in enumerate(edges):
+                    if Topology.IsSame(t_e, e):
+                        remove = True
+                        remove_faces += Topology.SuperTopologies(e, hostTopology=topology, topologyType="face")
+                        edges = edges[:i]+ edges[i:]
+                        break
+            if len(remove_faces) > 0:
+                return Topology.RemoveFaces(topology, remove_faces)
+        else:
+            remaining_edges = []
+            for t_e in t_edges:
+                remove = False
+                for i, e in enumerate(edges):
+                    if Topology.IsSame(t_e, e):
+                        remove = True
+                        edges = edges[:i]+ edges[i:]
+                        break
+                if not remove:
+                    remaining_edges.append(t_e)
+            if len(remaining_edges) < 1:
+                return None
+            elif len(remaining_edges) == 1:
+                return remaining_edges[0]
+            return Topology.SelfMerge(Cluster.ByTopologies(remaining_edges))
+
+    @staticmethod
+    def RemoveFaces(topology, faces=[]):
+        """
+        Removes the input list of faces from the input topology
+
+        Parameters
+        ----------
+        topology : topologic.Topology
+            The input topology.
+        faces : list
+            The input list of faces.
+
+        Returns
+        -------
+        topologic.Topology
+            The input topology with the input list of faces removed.
+
+        """
+
+        from topologicpy.Cluster import Cluster
+        if not isinstance(topology, topologic.Topology):
+            return None
+        faces = [f for f in faces if isinstance(f, topologic.Face)]
+        if len(faces) < 1:
+            return topology
+        t_faces = Topology.Faces(topology)
+        if len(t_faces) < 1:
+            return topology
+        remaining_faces = []
+        for t_f in t_faces:
+            remove = False
+            for i, f in enumerate(faces):
+                if Topology.IsSame(t_f, f):
+                    remove = True
+                    faces = faces[:i]+ faces[i:]
+                    break
+            if not remove:
+                remaining_faces.append(t_f)
+        if len(remaining_faces) < 1:
+            return None
+        elif len(remaining_faces) == 1:
+            return remaining_faces[0]
+        return Topology.SelfMerge(Cluster.ByTopologies(remaining_faces))
     
+    @staticmethod
+    def RemoveFacesBySelectors(topology, selectors=[], tolerance = 0.0001):
+        """
+        Removes faces that contain the input list of selectors (vertices) from the input topology
+
+        Parameters
+        ----------
+        topology : topologic.Topology
+            The input topology.
+        selectors : list
+            The input list of selectors (vertices).
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+
+        Returns
+        -------
+        topologic.Topology
+            The input topology with the identified faces removed.
+
+        """
+
+        from topologicpy.Face import Face
+        from topologicpy.Cluster import Cluster
+        if not isinstance(topology, topologic.Topology):
+            return None
+        selectors = [v for v in selectors if isinstance(v, topologic.Vertex)]
+        if len(selectors) < 1:
+            return topology
+        t_faces = Topology.Faces(topology)
+        to_remove = []
+        for t_f in t_faces:
+            remove = False
+            for i, v in enumerate(selectors):
+                if Face.IsInside(face=t_f, vertex=v, tolerance=tolerance):
+                    remove = True
+                    selectors = selectors[:i]+ selectors[i:]
+                    break
+            if remove:
+                to_remove.append(t_f)
+        if len(to_remove) < 1:
+            return topology
+        return Topology.RemoveFaces(topology, faces = to_remove)
+
+    @staticmethod
+    def RemoveVertices(topology, vertices=[]):
+        """
+        Removes the input list of vertices from the input topology
+
+        Parameters
+        ----------
+        topology : topologic.Topology
+            The input topology.
+        vertices : list
+            The input list of vertices.
+
+        Returns
+        -------
+        topologic.Topology
+            The input topology with the input list of vertices removed.
+
+        """
+
+        from topologicpy.Cluster import Cluster
+        if not isinstance(topology, topologic.Topology):
+            return None
+        vertices = [v for v in vertices if isinstance(v, topologic.Vertex)]
+        if len(vertices) < 1:
+            return topology
+        t_vertices = Topology.Vertices(topology)
+        t_edges = Topology.Edges(topology)
+        if len(t_vertices) < 1:
+            return topology
+        if len(t_edges) > 0:
+            remove_edges = []
+            for t_v in t_vertices:
+                remove = False
+                for i, v in enumerate(vertices):
+                    if Topology.IsSame(t_v, v):
+                        remove = True
+                        remove_edges += Topology.SuperTopologies(v, hostTopology=topology, topologyType="edge")
+                        vertices = vertices[:i]+ vertices[i:]
+                        break
+            if len(remove_edges) > 0:
+                return Topology.RemoveEdges(topology, remove_edges)
+        else:
+            remaining_vertices = []
+            for t_v in t_vertices:
+                remove = False
+                for i, e in enumerate(vertices):
+                    if Topology.IsSame(t_v, v):
+                        remove = True
+                        vertices = vertices[:i]+ vertices[i:]
+                        break
+                if not remove:
+                    remaining_vertices.append(t_v)
+            if len(remaining_vertices) < 1:
+                return None
+            elif len(remaining_vertices) == 1:
+                return remaining_vertices[0]
+            return Topology.SelfMerge(Cluster.ByTopologies(remaining_vertices))
+    
+    @staticmethod
+    def ReplaceVertices(topology, verticesA=[], verticesB=[], tolerance=0.0001):
+        """
+        Replaces the vertices in the first input list with the vertices in the second input list and rebuilds the input topology. The two lists must be of the same length.
+
+        Parameters
+        ----------
+        topology : topologic.Topology
+            The input topology.
+        verticesA : list
+            The first input list of vertices.
+        verticesB : list
+            The second input list of vertices.
+        tolerance : float, optional
+            The desired tolerance. The default is 0.0001.
+
+        Returns
+        -------
+        topologic.Topology
+            The new topology.
+
+        """
+        if not len(verticesA) == len(verticesB):
+            print("Error - Topology.ReplaceVertices: VerticesA and VerticesB must be the same length")
+            return None
+        from topologicpy.Vertex import Vertex
+        geom = Topology.Geometry(topology)
+        g_verts = geom['vertices']
+        g_edges = geom['edges']
+        g_faces = geom['faces']
+        verts = [Topology.Vertices(Topology.ByGeometry(vertices=[g_v]))[0] for g_v in g_verts]
+        for i, v in enumerate(verticesA):
+            n = Vertex.Index(v, verts, tolerance=tolerance)
+            if not n == None:
+                verts[n] = verticesB[i]
+        new_g_verts = []
+        for v in verts:
+            new_g_verts.append([Vertex.X(v),Vertex.Y(v),Vertex.Z(v)])
+        new_topology = Topology.ByGeometry(vertices=new_g_verts, edges=g_edges, faces=g_faces)
+        return new_topology
+
     @staticmethod
     def Rotate(topology, origin=None, x=0, y=0, z=1, degree=0):
         """
-        Rototates the input topology
+        Rotates the input topology
 
         Parameters
         ----------
@@ -4312,7 +4555,16 @@ class Topology():
     
     
     @staticmethod
-    def Show(topology, vertexLabelKey=None, vertexGroupKey=None, edgeLabelKey=None, edgeGroupKey=None, faceLabelKey=None, faceGroupKey=None, vertexGroups=[], edgeGroups=[], faceGroups=[], faceColor='white', faceOpacity=0.5, edgeColor='black', edgeWidth=1, vertexColor='black', vertexSize=1.1, showFaces=True, showEdges=True, showVertices=True, width=950, height=500, xAxis=False, yAxis=False, zAxis=False, axisSize=1, backgroundColor='rgba(0,0,0,0)', marginLeft=0, marginRight=0, marginTop=20, marginBottom=0, camera=[1.25, 1.25, 1.25], target=[0, 0, 0], up=[0, 0, 1], renderer="notebook", intensityKey=None, colorScale="Viridis", showScale=True):
+    def Show(topology, vertexLabelKey=None, vertexGroupKey=None, edgeLabelKey=None,
+             edgeGroupKey=None, faceLabelKey=None, faceGroupKey=None, vertexGroups=[],
+             edgeGroups=[], faceGroups=[], faceColor='white', faceOpacity=0.5,
+             edgeColor='black', edgeWidth=1, vertexColor='black', vertexSize=1.1,
+             showFaces=True, showEdges=True, showVertices=True, width=950, height=500,
+             xAxis=False, yAxis=False, zAxis=False, axisSize=1, backgroundColor='rgba(0,0,0,0)',
+             marginLeft=0, marginRight=0, marginTop=20, marginBottom=0, camera=[1.25, 1.25, 1.25],
+             target=[0, 0, 0], up=[0, 0, 1], renderer="notebook", intensityKey=None, showScale=False,
+             values=[], nTicks=5, xPosition=-0.15, colorbarWidth=15, outlineWidth=0, title="",
+             subTitle="", units="", colorScale="viridis", mantissa=4):
         """
         Shows the input topology on screen.
 
@@ -4408,10 +4660,30 @@ class Topology():
             The desired up vector. The default is [0,0,1].
         renderer : str , optional
             The desired renderer. See Plotly.Renderers(). The default is "notebook".
-        intensityKey: str, optional
+        intensityKey : str , optional
             If not None, the dictionary of each vertex is searched for the value associated with the intensity key. This value is then used to color-code the vertex based on the colorScale. The default is None.
+        showScale : bool , optional
+            If set to True, the colorbar is shown. The default is False.
+        values : list , optional
+            The input list of values to use for the colorbar. The default is [].
+        nTicks : int , optional
+            The number of ticks to use on the colorbar. The default is 5.
+        xPosition : float , optional
+            The x location of the colorbar. The default is -0.15.
+        colorbarWidth : int , optional
+            The width in pixels of the colorbar. The default is 15
+        outlineWidth : int , optional
+            The width in pixels of the outline of the colorbar. The default is 0.
+        title : str , optional
+            The title of the colorbar. The default is "".
+        subTitle : str , optional
+            The subtitle of the colorbar. The default is "".
+        units: str , optional
+            The units used in the colorbar. The default is ""
         colorScale : str , optional
-            The desired type of plotly color scales to use (e.g. "Viridis", "Plasma"). The default is "Viridis". For a full list of names, see https://plotly.com/python/builtin-colorscales/.
+            The desired type of plotly color scales to use (e.g. "viridis", "plasma"). The default is "viridis". For a full list of names, see https://plotly.com/python/builtin-colorscales/.
+        mantissa : int , optional
+            The desired length of the mantissa for the values listed on the colorbar. The default is 4.
 
         Returns
         -------
@@ -4423,6 +4695,8 @@ class Topology():
             return None
         data = Plotly.DataByTopology(topology=topology, vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, faceLabelKey=faceLabelKey, faceGroupKey=faceGroupKey, vertexGroups=vertexGroups, edgeGroups=edgeGroups, faceGroups=faceGroups, faceColor=faceColor, faceOpacity=faceOpacity, edgeColor=edgeColor, edgeWidth=edgeWidth, vertexColor=vertexColor, vertexSize=vertexSize, showFaces=showFaces, showEdges=showEdges, showVertices=showVertices, intensityKey=intensityKey, colorScale=colorScale, showScale=showScale)
         figure = Plotly.FigureByData(data=data, width=width, height=height, xAxis=xAxis, yAxis=yAxis, zAxis=zAxis, axisSize=axisSize, backgroundColor=backgroundColor, marginLeft=marginLeft, marginRight=marginRight, marginTop=marginTop, marginBottom=marginBottom)
+        if showScale:
+            figure = Plotly.AddColorBar(figure, values=values, nTicks=nTicks, xPosition=xPosition, width=colorbarWidth, outlineWidth=outlineWidth, title=title, subTitle=subTitle, units=units, colorScale=colorScale, mantissa=mantissa)
         Plotly.Show(figure=figure, renderer=renderer, camera=camera, target=target, up=up)
 
     @staticmethod
@@ -4641,6 +4915,8 @@ class Topology():
             The list of edges.
 
         """
+        if isinstance(topology, topologic.Edge) or isinstance(topology, topologic.Vertex):
+            return []
         return Topology.SubTopologies(topology=topology, subTopologyType="edge")
     
     @staticmethod
@@ -4659,6 +4935,8 @@ class Topology():
             The list of wires.
 
         """
+        if isinstance(topology, topologic.Wire) or isinstance(topology, topologic.Edge) or isinstance(topology, topologic.Vertex):
+            return []
         return Topology.SubTopologies(topology=topology, subTopologyType="wire")
     
     @staticmethod
@@ -4677,6 +4955,8 @@ class Topology():
             The list of faces.
 
         """
+        if isinstance(topology, topologic.Face) or isinstance(topology, topologic.Wire) or isinstance(topology, topologic.Edge) or isinstance(topology, topologic.Vertex):
+            return []
         return Topology.SubTopologies(topology=topology, subTopologyType="face")
     
     @staticmethod
@@ -4695,6 +4975,8 @@ class Topology():
             The list of shells.
 
         """
+        if isinstance(topology, topologic.Shell) or isinstance(topology, topologic.Face) or isinstance(topology, topologic.Wire) or isinstance(topology, topologic.Edge) or isinstance(topology, topologic.Vertex):
+            return []
         return Topology.SubTopologies(topology=topology, subTopologyType="shell")
     
     @staticmethod
@@ -4713,6 +4995,9 @@ class Topology():
             The list of cells.
 
         """
+        if isinstance(topology, topologic.Cell) or isinstance(topology, topologic.Shell) or isinstance(topology, topologic.Face) or isinstance(topology, topologic.Wire) or isinstance(topology, topologic.Edge) or isinstance(topology, topologic.Vertex):
+            return []
+        return Topology.SubTopologies(topology=topology, subTopologyType="shell")
         return Topology.SubTopologies(topology=topology, subTopologyType="cell")
     
     @staticmethod
@@ -4731,6 +5016,8 @@ class Topology():
             The list of cellcomplexes.
 
         """
+        if isinstance(topology, topologic.CellComplex) or isinstance(topology, topologic.Cell) or isinstance(topology, topologic.Shell) or isinstance(topology, topologic.Face) or isinstance(topology, topologic.Wire) or isinstance(topology, topologic.Edge) or isinstance(topology, topologic.Vertex):
+            return []
         return Topology.SubTopologies(topology=topology, subTopologyType="cellcomplex")
     
     @staticmethod

topologicpy/__init__.py

@@ -2,7 +2,7 @@ import sys
 import os, re
 from sys import platform
 
-__version__ = '0.3.6'
+__version__ = '0.3.8'
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 
 if platform == 'win32':

{topologicpy-0.3.6.dist-info → topologicpy-0.3.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.3.6
+Version: 0.3.8
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 Project-URL: Homepage, https://github.com/wassimj/TopologicPy