topologicpy 0.4.75__py3-none-any.whl → 0.4.77__py3-none-any.whl

topologicpy/Graph.py

@@ -4969,7 +4969,10 @@ class Graph:
                     if ang < 180:
                         viewpointsA.append(vertices[i])
                         viewpointsB.append(vertices[i])
-        obstacle_cluster = Cluster.ByTopologies(obstacles)
+        if len(obstacles) > 0:
+            obstacle_cluster = Cluster.ByTopologies(obstacles)
+        else:
+            obstacle_cluster = None
         final_edges = []
         for i in tqdm(range(len(viewpointsA))):
             va = viewpointsA[i]
@@ -4977,18 +4980,23 @@ class Graph:
                 vb = viewpointsB[j]
                 if Vertex.Distance(va, vb) > tolerance:
                     edge = Edge.ByVertices([va,vb])
-                    result = Topology.Difference(edge, obstacle_cluster)
+                    if not obstacle_cluster == None:
+                        result = Topology.Difference(edge, obstacle_cluster)
+                    else:
+                        result = edge
                     if not result == None:
                         result2 = Topology.Difference(result, face)
                         if isinstance(result2, topologic.Edge) or isinstance(result2, topologic.Cluster):
                             result = result2
                     if isinstance(result, topologic.Edge):
-                        sv = Edge.StartVertex(result)
-                        ev = Edge.EndVertex(result)
-                        if (not Vertex.Index(sv, viewpointsA+viewpointsB) == None) and (not Vertex.Index(ev, viewpointsA+viewpointsB) == None):
-                            final_edges.append(result)
-        face_edges = Topology.Edges(face)
-        final_edges += face_edges
+                        if abs(Edge.Length(result) - Edge.Length(edge)) < tolerance:
+                            sv = Edge.StartVertex(result)
+                            ev = Edge.EndVertex(result)
+                            if (not Vertex.Index(sv, viewpointsA+viewpointsB) == None) and (not Vertex.Index(ev, viewpointsA+viewpointsB) == None):
+                                final_edges.append(result)
+        if len(i_boundaries) > 0:
+            holes_edges = Topology.Edges(Cluster.ByTopologies(i_boundaries))
+            final_edges += holes_edges
         if len(final_edges) > 0:
             final_vertices = Topology.Vertices(Cluster.ByTopologies(final_edges))
             g = Graph.ByVerticesEdges(final_vertices, final_edges)
@@ -5149,7 +5157,7 @@ class Graph:
     @staticmethod
     def PyvisGraph(graph, path, overwrite=True, height=900, backgroundColor="white", fontColor="black", notebook=False,
                    vertexSize=6, vertexSizeKey=None, vertexColor="black", vertexColorKey=None, vertexLabelKey=None, vertexGroupKey=None, vertexGroups=None, minVertexGroup=None, maxVertexGroup=None, 
-                   edgeWeight=0, edgeWeightKey=None, showNeighbours=True, selectMenu=True, filterMenu=True, colorScale="viridis"):
+                   edgeLabelKey=None, edgeWeight=0, edgeWeightKey=None, showNeighbours=True, selectMenu=True, filterMenu=True, colorScale="viridis"):
         """
         Displays a pyvis graph. See https://pyvis.readthedocs.io/.
 
@@ -5192,6 +5200,8 @@ class Graph:
             The desired default weight of the edge. This determines its thickness. The default is 0.
         edgeWeightKey : str, optional
             If not set to None, the edge weight will be derived from the dictionary value set at this key. If set to "length" or "distance", the weight of the edge will be determined by its geometric length. The default is None.
+        edgeLabelKey : str , optional
+            If not set to None, the edge label will be derived from the dictionary value set at this key. The default is None.
         showNeighbors : bool , optional
             If set to True, a list of neighbors is shown when you hover over a vertex. The default is True.
         selectMenu : bool , optional
@@ -5269,6 +5279,12 @@ class Graph:
         net.add_nodes(nodes, label=node_labels, title=node_titles, color=colors)
 
         for e in edges:
+            edge_label = ""
+            if not edgeLabelKey == None:
+                d = Topology.Dictionary(e)
+                edge_label = Dictionary.ValueAtKey(d, edgeLabelKey)
+                if edge_label == None:
+                    edge_label = ""
             w = edgeWeight
             if not edgeWeightKey == None:
                 d = Topology.Dictionary(e)
@@ -5282,7 +5298,7 @@ class Graph:
             ev = Edge.EndVertex(e)
             svi = Vertex.Index(sv, vertices)
             evi = Vertex.Index(ev, vertices)
-            net.add_edge(svi, evi, weight=w)
+            net.add_edge(svi, evi, weight=w, label=edge_label)
         net.inherit_edge_colors(False)
         
         # add neighbor data to node hover data and compute vertexSize
@@ -5742,6 +5758,8 @@ class Graph:
 
         """
         from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
+        
         def vertexInList(vertex, vertexList):
             if vertex and vertexList:
                 if isinstance(vertex, topologic.Vertex) and isinstance(vertexList, list):
@@ -5771,7 +5789,11 @@ class Graph:
             if not vertexInList(vertex, vertices):
                 vertices.append(vertex)
                 if parent:
-                    edges.append(Graph.Edge(graph, parent, vertex, tolerance))
+                    edge = Graph.Edge(graph, parent, vertex, tolerance)
+                    ev = Edge.EndVertex(edge)
+                    if Vertex.Distance(parent, ev) < tolerance:
+                        edge = Edge.Reverse(edge)
+                    edges.append(edge)
             if parent == None:
                 parent = vertex
             children = getChildren(vertex, parent, graph, vertices)

topologicpy/Topology.py

@@ -1500,7 +1500,7 @@ class Topology():
         return Topology.ByBREPFile(file)
     
     @staticmethod
-    def ByIFCFile(file, transferDictionaries=False):
+    def ByIFCFile(file, transferDictionaries=False, includeTypes=[], excludeTypes=[]):
         """
         Create a topology by importing it from an IFC file.
 
@@ -1510,6 +1510,10 @@ class Topology():
             The input 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.
+        includeTypes : list , optional
+            The list of IFC object types to include. It is case insensitive. If set to an empty list, all types are included. The default is [].
+        excludeTypes : list , optional
+            The list of IFC object types to exclude. It is case insensitive. If set to an empty list, no types are excluded. The default is [].
         
         Returns
         -------
@@ -1525,6 +1529,8 @@ class Topology():
         if not file:
             print("Topology.ByIFCFile - Error: the input file parameter is not a valid file. Returning None.")
             return None
+        includeTypes = [s.lower() for s in includeTypes]
+        excludeTypes = [s.lower() for s in excludeTypes]
         topologies = []
         settings = ifcopenshell.geom.settings()
         settings.set(settings.DISABLE_TRIANGULATION, True)
@@ -1535,38 +1541,43 @@ class Topology():
         if iterator.initialize():
             while True:
                 shape = iterator.get()
-                brep = shape.geometry.brep_data
-                topology = Topology.ByBREPString(brep)
-                if transferDictionaries:
-                        keys = []
-                        values = []
-                        keys.append("TOPOLOGIC_color")
-                        values.append([1.0,1.0,1.0,1.0])
-                        keys.append("TOPOLOGIC_id")
-                        values.append(str(uuid.uuid4()))
-                        keys.append("TOPOLOGIC_name")
-                        values.append(shape.name)
-                        keys.append("TOPOLOGIC_type")
-                        values.append(Topology.TypeAsString(topology))
-                        keys.append("IFC_id")
-                        values.append(str(shape.id))
-                        keys.append("IFC_guid")
-                        values.append(str(shape.guid))
-                        keys.append("IFC_unique_id")
-                        values.append(str(shape.unique_id))
-                        keys.append("IFC_name")
-                        values.append(shape.name)
-                        keys.append("IFC_type")
-                        values.append(shape.type)
-                        d = Dictionary.ByKeysValues(keys, values)
-                        topology = Topology.SetDictionary(topology, d)
-                topologies.append(topology)
+                is_a = shape.type.lower()
+                if (is_a in includeTypes or len(includeTypes) == 0) and (not is_a in excludeTypes):
+                    try:
+                        brep = shape.geometry.brep_data
+                        topology = Topology.SelfMerge(Topology.ByBREPString(brep))
+                        if transferDictionaries:
+                            keys = []
+                            values = []
+                            keys.append("TOPOLOGIC_color")
+                            values.append([1.0,1.0,1.0,1.0])
+                            keys.append("TOPOLOGIC_id")
+                            values.append(str(uuid.uuid4()))
+                            keys.append("TOPOLOGIC_name")
+                            values.append(shape.name)
+                            keys.append("TOPOLOGIC_type")
+                            values.append(Topology.TypeAsString(topology))
+                            keys.append("IFC_id")
+                            values.append(str(shape.id))
+                            keys.append("IFC_guid")
+                            values.append(str(shape.guid))
+                            keys.append("IFC_unique_id")
+                            values.append(str(shape.unique_id))
+                            keys.append("IFC_name")
+                            values.append(shape.name)
+                            keys.append("IFC_type")
+                            values.append(shape.type)
+                            d = Dictionary.ByKeysValues(keys, values)
+                            topology = Topology.SetDictionary(topology, d)
+                        topologies.append(topology)
+                    except:
+                        pass
                 if not iterator.next():
                     break
         return topologies
 
     @staticmethod
-    def ByIFCPath(path, transferDictionaries=False):
+    def ByIFCPath(path, transferDictionaries=False, includeTypes=[], excludeTypes=[]):
         """
         Create a topology by importing it from an IFC file path.
 
@@ -1576,7 +1587,10 @@ class Topology():
             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.
-        
+        includeTypes : list , optional
+            The list of IFC object types to include. It is case insensitive. If set to an empty list, all types are included. The default is [].
+        excludeTypes : list , optional
+            The list of IFC object types to exclude. It is case insensitive. If set to an empty list, no types are excluded. The default is [].
         Returns
         -------
         list
@@ -1595,7 +1609,7 @@ class Topology():
         if not file:
             print("Topology.ByIFCPath - Error: the input file parameter is not a valid file. Returning None.")
             return None
-        return Topology.ByIFCFile(file, transferDictionaries=transferDictionaries)
+        return Topology.ByIFCFile(file, transferDictionaries=transferDictionaries, includeTypes=includeTypes, excludeTypes=excludeTypes)
     
     '''
     @staticmethod

topologicpy/__init__.py

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

{topologicpy-0.4.75.dist-info → topologicpy-0.4.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.75
+Version: 0.4.77
 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

{topologicpy-0.4.75.dist-info → topologicpy-0.4.77.dist-info}/RECORD

@@ -9,7 +9,7 @@ topologicpy/Dictionary.py,sha256=vGhiXPu7e7GsgQyTsX6rZBncnnrDlcYfM9xRb9h-l3U,247
 topologicpy/Edge.py,sha256=lMO4TSzN3AJNgS5Vfvl0DBY-aMn8S82xT4TXs7LdUnc,45644
 topologicpy/EnergyModel.py,sha256=WsK40w0eO6WswV6JxYztvX6zBFwTNFvDHOScXxACf08,51760
 topologicpy/Face.py,sha256=jVy6_t0ZUec7l_gXzCEUfAs1Kaap7lfPNvipwRbgLI8,93590
-topologicpy/Graph.py,sha256=JwKHWoHHJmdDZglI2qkzhi7KIFa06bV1kXNejKY8-iU,285304
+topologicpy/Graph.py,sha256=EhEIBpxV_ulY-poOOZVmbzUQVjw6I3Thcq27D1tUjAk,286407
 topologicpy/Grid.py,sha256=q6uAs8MGbdteYNbjqRjqlhFMquYAvSngwzxsFl9-338,17371
 topologicpy/Helper.py,sha256=nG9v3_v4XhPH0HM1lNkLqJ_z1LIjxsugCu_HxG0voYA,13680
 topologicpy/Honeybee.py,sha256=ygiGMS7u-YQJWpK2CmkBuJu1DBABVUmpMdg9HewOhN4,20349
@@ -19,11 +19,11 @@ topologicpy/Plotly.py,sha256=ZlqdrP8uY118fRkX08B95ZUO7pLa04s5-daaSmFCgHo,95277
 topologicpy/Polyskel.py,sha256=-M47SAFWrFOheZ9KWUEgYOmCn-V_rfKPKvU8KY4B-1s,16450
 topologicpy/Shell.py,sha256=UEbSaahZ4kDqAagwIvOLBt7QR3YshjQ4oNVNBlAlz8s,81460
 topologicpy/Speckle.py,sha256=zKqiHYuw7498W_9UWvDn2xsdBskhahNjJejxegMpbJA,14773
-topologicpy/Topology.py,sha256=zjGBxnVvlx8-7EARFgnIpD49nVfdDAyYKoHuABWHLgU,286145
+topologicpy/Topology.py,sha256=gZtes0iY6gk5l57H2znUJZHG3P6Xjm4jhewWIeJ_TpI,287484
 topologicpy/Vector.py,sha256=g28SO3yggTfYfpGqjE-dXpk1loQb9ZaZvP12B7Fzdcw,19564
 topologicpy/Vertex.py,sha256=A7hCI-WpHaemow4eDiaqVhZ0ekgifXcWFpa-82txwYM,55187
 topologicpy/Wire.py,sha256=gMqOqNOmph2Elup6j8bNrorBZfCScVChjTvq03rB6NA,133812
-topologicpy/__init__.py,sha256=z5esdHnV5HVFvZvCsauWZOvak_fb9HNSvWnJsEjvDM4,1445
+topologicpy/__init__.py,sha256=hRG-QJ5JILLbi3xBXGIkLR7fso8R-SdVBlQpC96Gd1w,1445
 topologicpy/bin/linux/topologic/__init__.py,sha256=XlFReDf3FWlYdM9uXtanYPIafgPb6GVTQczS_xJAXD0,60
 topologicpy/bin/linux/topologic/libTKBO-6bdf205d.so.7.7.0,sha256=ANok9DQKcnWcLd9T_LAt-i-X4nsYYy16q9kQlcTre1E,2996488
 topologicpy/bin/linux/topologic/libTKBRep-2960a069.so.7.7.0,sha256=OJ3XesL79du8LeBHrsleGPXub6OpJdOilxha0mwjqQo,1378768
@@ -84,8 +84,8 @@ topologicpy/bin/windows/topologic/topologic.cp310-win_amd64.pyd,sha256=F0sPLuMpD
 topologicpy/bin/windows/topologic/topologic.cp311-win_amd64.pyd,sha256=aBAJQj3OmJ58MOAF1ZIFybL_5fFK7FNR9hrIps6b6pc,1551872
 topologicpy/bin/windows/topologic/topologic.cp38-win_amd64.pyd,sha256=aLgNf54nbJmGc7Tdmkuy-V0m6B9zLxabIbpRwAy7cBA,1551360
 topologicpy/bin/windows/topologic/topologic.cp39-win_amd64.pyd,sha256=_8cp205hiRxkFHtzQQOweA4DhCPk8caH4kTVLWGQeVw,1411584
-topologicpy-0.4.75.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
-topologicpy-0.4.75.dist-info/METADATA,sha256=eeXMZOoeqEX35lE8WX81atMRaTrz-qy5gF1YOMY19Dk,7252
-topologicpy-0.4.75.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-topologicpy-0.4.75.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.4.75.dist-info/RECORD,,
+topologicpy-0.4.77.dist-info/LICENSE,sha256=RUmXeeqj63bBySLJjEfhwb9OE7M8h9K6HuOBF3ASVyI,35697
+topologicpy-0.4.77.dist-info/METADATA,sha256=u2Tw8i9lrJBM4zcsmXBNZbaPhNTVYr0pxTy3k2DczRE,7252
+topologicpy-0.4.77.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+topologicpy-0.4.77.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.4.77.dist-info/RECORD,,