topologicpy 0.7.50__py3-none-any.whl → 0.7.52__py3-none-any.whl

topologicpy/Color.py

@@ -371,7 +371,7 @@ class Color:
         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] where the range is from 0 to 255.
         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/Dictionary.py

@@ -642,10 +642,8 @@ class Dictionary():
             The value found at the input key in the input dictionary.
 
         """
-        import json
         from topologicpy.Topology import Topology
         
-        
         if not Topology.IsInstance(dictionary, "Dictionary") and not isinstance(dictionary, dict):
             print("Dictionary.ValueAtKey - Error: The input dictionary parameter is not a valid topologic or python dictionary. Returning None.")
             return None

topologicpy/Face.py

@@ -2373,7 +2373,7 @@ class Face():
             from topologicpy.Face import Face
 
             if not Topology.IsInstance(face, "Face"):
-                print("Shell.ByMeshFace - Error: The input face parameter is not a valid face. Returning None.")
+                print("Face.Triangulate - Error: The input face parameter is not a valid face. Returning None.")
                 return None
             if not meshSize:
                 bounding_face = Face.BoundingRectangle(face)
@@ -2477,9 +2477,11 @@ class Face():
                 wire = Face.ExternalBoundary(f)
                 wire = Wire.Invert(wire)
                 f = Face.ByWire(wire)
-                finalFaces.append(f)
+                if Topology.IsInstance(f, "Face"):
+                    finalFaces.append(f)
             else:
-                finalFaces.append(f)
+                if Topology.IsInstance(f, "face"):
+                    finalFaces.append(f)
         face_normal = Face.Normal(face)
         return_faces = []
         for ff in finalFaces:

topologicpy/Graph.py

@@ -2177,6 +2177,12 @@ class Graph:
             for ifc_rel in ifc_relationships:
                 source = None
                 destinations = []
+                if ifc_rel.is_a("IfcRelConnectsPorts"):
+                    source = ifc_rel.RelatingPort
+                    destinations = ifc_rel.RelatedPorts
+                if ifc_rel.is_a("IfcRelConnectsPortToElement"):
+                    source = ifc_rel.RelatingPort
+                    destinations = [ifc_rel.RelatedElement]
                 if ifc_rel.is_a("IfcRelAggregates"):
                     source = ifc_rel.RelatingObject
                     destinations = ifc_rel.RelatedObjects

topologicpy/Plotly.py

@@ -372,12 +372,11 @@ class Plotly:
                     v_label = ""
                     v_group = ""
                     d = Topology.Dictionary(v)
-                    v_group = Dictionary.ValueAtKey(d, key=vertexGroupKey)
                     if d:
                         if vertexLabelKey:
                             v_label = str(Dictionary.ValueAtKey(d, key=vertexLabelKey)) or ""
                         if vertexGroupKey:
-                            v_group = Dictionary.ValueAtKey(d, key=vertexGroupKey) or None
+                            v_group = Dictionary.ValueAtKey(d, key=vertexGroupKey) or ""
                     try:
                         v_groupList.append(vertexGroups.index(v_group))
                     except:
@@ -439,14 +438,10 @@ class Plotly:
                     e_group = ""
                     d = Topology.Dictionary(e)
                     if d:
-                        try:
+                        if not edgeLabelKey == None:
                             e_label = str(Dictionary.ValueAtKey(d, key=edgeLabelKey)) or ""
-                        except:
-                            e_label = ""
-                        try:
+                        if not edgeGroupKey == None:
                             e_group = str(Dictionary.ValueAtKey(d, key=edgeGroupKey)) or ""
-                        except:
-                            e_group = ""
                     try:
                         e_groupList.append(edgeGroups.index(e_group))
                     except:
@@ -490,12 +485,12 @@ class Plotly:
     @staticmethod
     def DataByTopology(topology,
                        showVertices=True, vertexSize=1.1, vertexColor="black", 
-                       vertexLabelKey=None, vertexGroupKey=None, vertexGroups=[], 
+                       vertexLabelKey=None, showVertexLabel=False, vertexGroupKey=None, vertexGroups=[], 
                        vertexMinGroup=None, vertexMaxGroup=None, 
                        showVertexLegend=False, vertexLegendLabel="Topology Vertices", vertexLegendRank=1,
                        vertexLegendGroup=1,
                        showEdges=True, edgeWidth=1, edgeColor="black", 
-                       edgeLabelKey=None, edgeGroupKey=None, edgeGroups=[], 
+                       edgeLabelKey=None, showEdgeLabel=False, edgeGroupKey=None, edgeGroups=[], 
                        edgeMinGroup=None, edgeMaxGroup=None, 
                        showEdgeLegend=False, edgeLegendLabel="Topology Edges", edgeLegendRank=2, 
                        edgeLegendGroup=2,
@@ -633,14 +628,14 @@ class Plotly:
         def closest_index(input_value, values):
             return int(min(range(len(values)), key=lambda i: abs(values[i] - input_value)))
 
-        def vertexData(vertices, dictionaries=[], color="black", size=1.1, labelKey=None, groupKey=None, minGroup=None, maxGroup=None, groups=[], legendLabel="Topology Vertices", legendGroup=1, legendRank=1, showLegend=True, colorScale="Viridis"):
+        def vertexData(vertices, dictionaries=[], color="black", size=1.1, labelKey=None, showVertexLabel = False, groupKey=None, minGroup=None, maxGroup=None, groups=[], legendLabel="Topology Vertices", legendGroup=1, legendRank=1, showLegend=True, colorScale="Viridis"):
             x = []
             y = []
             z = []
             labels = []
             groupList = []
             label = ""
-            group = ""
+            group = None
             if labelKey or groupKey:
                 if groups:
                     if len(groups) > 0:
@@ -660,20 +655,18 @@ class Plotly:
                     y.append(v[1])
                     z.append(v[2])
                     label = ""
-                    group = ""
+                    group = None
                     if len(dictionaries) > 0:
                         d = dictionaries[m]
                         if d:
-                            try:
+                            if not labelKey == None:
                                 label = str(Dictionary.ValueAtKey(d, key=labelKey)) or ""
-                            except:
-                                label = ""
-                            try:
-                                group = Dictionary.ValueAtKey(d, key=groupKey) or None
-                            except:
-                                group = ""
+                            if not groupKey == None:
+                                group = Dictionary.ValueAtKey(d, key=groupKey) or ""
                         try:
-                            if type(group) == int or type(group) == float:
+                            if group == "":
+                                color = 'white'
+                            elif type(group) == int or type(group) == float:
                                 if group < minGroup:
                                     group = minGroup
                                 if group > maxGroup:
@@ -696,13 +689,17 @@ class Plotly:
                 groupList = color
             if len(labels) < 1:
                 labels = ""
+            if showVertexLabel == True:
+                mode = "markers+text"
+            else:
+                mode = "markers"
             vData= go.Scatter3d(x=x,
                                 y=y,
                                 z=z,
                                 name=legendLabel,
                                 showlegend=showLegend,
                                 marker=dict(color=groupList,  size=vertexSize),
-                                mode='markers',
+                                mode=mode,
                                 legendgroup=legendGroup,
                                 legendrank=legendRank,
                                 text=labels,
@@ -711,7 +708,7 @@ class Plotly:
                                 )
             return vData
 
-        def edgeData(vertices, edges, dictionaries=None, color="black", width=1, labelKey=None, groupKey=None, minGroup=None, maxGroup=None, groups=[], legendLabel="Topology Edges", legendGroup=2, legendRank=2, showLegend=True, colorScale="Viridis"):
+        def edgeData(vertices, edges, dictionaries=None, color="black", width=1, labelKey=None, showEdgeLabel = False, groupKey=None, minGroup=None, maxGroup=None, groups=[], legendLabel="Topology Edges", legendGroup=2, legendRank=2, showLegend=True, colorScale="Viridis"):
             x = []
             y = []
             z = []
@@ -740,19 +737,17 @@ class Plotly:
                     y+=[sv[1], ev[1], None] # y-coordinates of edge ends
                     z+=[sv[2], ev[2], None] # z-coordinates of edge ends
                     label = ""
-                    group = ""
+                    group = None
                     if len(dictionaries) > 0:
                         d = dictionaries[m]
                         if d:
-                            try:
+                            if not labelKey == None:
                                 label = str(Dictionary.ValueAtKey(d, key=labelKey)) or ""
-                            except:
-                                label = ""
-                            try:
-                                group = Dictionary.ValueAtKey(d, key=groupKey) or None
-                            except:
-                                group = ""
+                            if not groupKey == None:
+                                group = Dictionary.ValueAtKey(d, key=groupKey) or ""
                         try:
+                            if group == "":
+                                color = 'white'
                             if type(group) == int or type(group) == float:
                                 if group < minGroup:
                                     group = minGroup
@@ -778,13 +773,17 @@ class Plotly:
                     groupList = color
             if len(labels) < 1:
                 labels = ""
+            if showEdgeLabel == True:
+                mode = "lines+text"
+            else:
+                mode = "lines"
             eData = go.Scatter3d(x=x,
                                 y=y,
                                 z=z,
                                 name=legendLabel,
                                 showlegend=showLegend,
                                 marker_size=0,
-                                mode="lines",
+                                mode=mode,
                                 line=dict(color=groupList, width=edgeWidth),
                                 legendgroup=legendGroup,
                                 legendrank=legendRank,
@@ -834,16 +833,14 @@ class Plotly:
                     if len(dictionaries) > 0:
                         d = dictionaries[m]
                         if d:
-                            try:
+                            if not labelKey == None:
                                 label = str(Dictionary.ValueAtKey(d, key=labelKey)) or ""
-                            except:
-                                label = ""
-                            try:
+                            if not groupKey == None:
                                 group = Dictionary.ValueAtKey(d, key=groupKey) or None
-                            except:
-                                group = ""
                         try:
-                            if type(group) == int or type(group) == float:
+                            if group == "":
+                                color = 'white'
+                            elif type(group) == int or type(group) == float:
                                 if group < minGroup:
                                     group = minGroup
                                 if group > maxGroup:
@@ -955,7 +952,7 @@ class Plotly:
                             d = Topology.Dictionary(tp_v)
                             v_dictionaries.append(d)
                         vertices.append([Vertex.X(tp_v, mantissa=mantissa), Vertex.Y(tp_v, mantissa=mantissa), Vertex.Z(tp_v, mantissa=mantissa)])
-                data.append(vertexData(vertices, dictionaries=v_dictionaries, color=vertexColor, size=vertexSize, labelKey=vertexLabelKey, groupKey=vertexGroupKey, minGroup=vertexMinGroup, maxGroup=vertexMaxGroup, groups=vertexGroups, legendLabel=vertexLegendLabel, legendGroup=vertexLegendGroup, legendRank=vertexLegendRank, showLegend=showVertexLegend, colorScale=colorScale))
+                data.append(vertexData(vertices, dictionaries=v_dictionaries, color=vertexColor, size=vertexSize, labelKey=vertexLabelKey, showVertexLabel=showVertexLabel, groupKey=vertexGroupKey, minGroup=vertexMinGroup, maxGroup=vertexMaxGroup, groups=vertexGroups, legendLabel=vertexLegendLabel, legendGroup=vertexLegendGroup, legendRank=vertexLegendRank, showLegend=showVertexLegend, colorScale=colorScale))
             
         if showEdges and Topology.Type(topology) > Topology.TypeID("Vertex"):
             if Topology.Type(topology) == Topology.TypeID("Edge"):
@@ -971,7 +968,7 @@ class Plotly:
                 geo = Topology.Geometry(e_cluster, mantissa=mantissa)
                 vertices = geo['vertices']
                 edges = geo['edges']
-                data.append(edgeData(vertices, edges, dictionaries=e_dictionaries, color=edgeColor, width=edgeWidth, labelKey=edgeLabelKey, groupKey=edgeGroupKey, minGroup=edgeMinGroup, maxGroup=edgeMaxGroup, groups=edgeGroups, legendLabel=edgeLegendLabel, legendGroup=edgeLegendGroup, legendRank=edgeLegendRank, showLegend=showEdgeLegend, colorScale=colorScale))
+                data.append(edgeData(vertices, edges, dictionaries=e_dictionaries, color=edgeColor, width=edgeWidth, labelKey=edgeLabelKey, showEdgeLabel=showEdgeLabel, groupKey=edgeGroupKey, minGroup=edgeMinGroup, maxGroup=edgeMaxGroup, groups=edgeGroups, legendLabel=edgeLegendLabel, legendGroup=edgeLegendGroup, legendRank=edgeLegendRank, showLegend=showEdgeLegend, colorScale=colorScale))
         
         if showFaces and Topology.Type(topology) >= Topology.TypeID("Face"):
             if Topology.IsInstance(topology, "Face"):