topologicpy 0.4.76__tar.gz → 0.4.77__tar.gz

{topologicpy-0.4.76/src/topologicpy.egg-info → topologicpy-0.4.77}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.4.76
+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.76 → topologicpy-0.4.77}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.4.76"
+version = "0.4.77"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]

{topologicpy-0.4.76 → topologicpy-0.4.77}/src/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,7 +4980,10 @@ 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):
@@ -5752,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):
@@ -5781,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-0.4.76 → topologicpy-0.4.77}/src/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-0.4.76 → topologicpy-0.4.77}/src/topologicpy/__init__.py

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

{topologicpy-0.4.76 → topologicpy-0.4.77/src/topologicpy.egg-info}/PKG-INFO

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