topologicpy 0.7.40__py3-none-any.whl → 0.7.42__py3-none-any.whl

topologicpy/Face.py

@@ -323,7 +323,10 @@ class Face():
                 print("Face.ByOffset - Warning: The input face parameter is not a valid face. Returning None.")
             return None
         
+        if abs(Face.Normal(face)[2] + 1) < tolerance:
+            reverse = not(reverse)
         eb = Face.Wire(face)
+        
         internal_boundaries = Face.InternalBoundaries(face)
         offset_external_boundary = Wire.ByOffset(eb,
                                                  offset=offset,

topologicpy/Topology.py

@@ -2138,7 +2138,7 @@ class Topology():
         return Topology.ByDXFFile(file, sides=sides)
 
     @staticmethod
-    def ByIFCFile(file, transferDictionaries=False, includeTypes=[], excludeTypes=[]):
+    def ByIFCFile(file, includeTypes=[], excludeTypes=[], transferDictionaries=False, removeCoplanarFaces=False):
         """
         Create a topology by importing it from an IFC file.
 
@@ -2146,13 +2146,14 @@ class Topology():
         ----------
         file : file object
             The input IFC file.
-        transferDictionaries : bool , optional
-            If set to True, the dictionaries from the IFC file will be transferred 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 [].
-        
+        transferDictionaries : bool , optional
+            If set to True, the dictionaries from the IFC file will be transferred to the topology. Otherwise, they won't. The default is False.
+        removeCoplanarFaces : bool , optional
+            If set to True, coplanar faces are removed. Otherwise they are not. The default is False.
         Returns
         -------
         list
@@ -2187,19 +2188,25 @@ class Topology():
         excludeTypes = [s.lower() for s in excludeTypes]
         topologies = []
         settings = ifcopenshell.geom.settings()
-        settings.set(settings.DISABLE_TRIANGULATION, True)
-        settings.set(settings.USE_BREP_DATA, True)
+        settings.set("dimensionality", ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)
         settings.set(settings.USE_WORLD_COORDS, True)
-        settings.set(settings.SEW_SHELLS, True)
         iterator = ifcopenshell.geom.iterator(settings, file, multiprocessing.cpu_count())
         if iterator.initialize():
             while True:
                 shape = iterator.get()
                 is_a = shape.type.lower()
-                if (is_a in includeTypes or len(includeTypes) == 0) and (not is_a in excludeTypes):
+                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))
+                        verts = shape.geometry.verts
+                        edges = shape.geometry.edges
+                        faces = shape.geometry.faces
+                        grouped_verts = [ [verts[i], verts[i + 1], verts[i + 2]] for i in range(0, len(verts), 3)]
+                        grouped_edges = [[edges[i], edges[i + 1]] for i in range(0, len(edges), 2)]
+                        grouped_faces = [ [faces[i], faces[i + 1], faces[i + 2]] for i in range(0, len(faces), 3)]
+                        topology = Topology.ByGeometry(grouped_verts, grouped_edges, grouped_faces)
+                        if removeCoplanarFaces:
+                            topology = Topology.RemoveCoplanarFaces(topology)
+                        topologies.append(topology)
                         if transferDictionaries:
                             keys = []
                             values = []
@@ -2231,7 +2238,7 @@ class Topology():
         return topologies
 
     @staticmethod
-    def ByIFCPath(path, transferDictionaries=False, includeTypes=[], excludeTypes=[]):
+    def ByIFCPath(path, includeTypes=[], excludeTypes=[], transferDictionaries=False, removeCoplanarFaces=False):
         """
         Create a topology by importing it from an IFC file path.
 
@@ -2239,12 +2246,14 @@ class Topology():
         ----------
         path : str
             The path to the IFC file.
-        transferDictionaries : bool , optional
-            If set to True, the dictionaries from the IFC file will be transferred 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 [].
+        transferDictionaries : bool , optional
+            If set to True, the dictionaries from the IFC file will be transferred to the topology. Otherwise, they won't. The default is False.
+        removeCoplanarFaces : bool , optional
+            If set to True, coplanar faces are removed. Otherwise they are not. The default is False.
         
         Returns
         -------
@@ -2264,7 +2273,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, includeTypes=includeTypes, excludeTypes=excludeTypes)
+        return Topology.ByIFCFile(file, includeTypes=includeTypes, excludeTypes=excludeTypes, transferDictionaries=transferDictionaries, removeCoplanarFaces=removeCoplanarFaces)
     
     '''
     @staticmethod

topologicpy/Wire.py

@@ -365,7 +365,7 @@ class Wire():
             fac = -1
         else:
             fac = 1
-        origin = Vertex.Origin()
+        origin = Topology.Centroid(wire)
         temp_vertices = [Topology.Vertices(wire)[0], Topology.Vertices(wire)[1], Topology.Centroid(wire)]
         temp_face = Face.ByWire(Wire.ByVertices(temp_vertices, close=True))
         temp_normal = Face.Normal(temp_face)

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.40'
+__version__ = '0.7.42'

{topologicpy-0.7.40.dist-info → topologicpy-0.7.42.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.40
+Version: 0.7.42
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: MIT License

{topologicpy-0.7.40.dist-info → topologicpy-0.7.42.dist-info}/RECORD

@@ -9,7 +9,7 @@ topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=KqJ29YyE23Y3Xc6XmKLSCZXRfBvm-OEOxlMZ4dt-rfM,27094
 topologicpy/Edge.py,sha256=vhYHkobSLGSWV-oe2oJFFDobqFToDyb7s71yQ840AAA,65166
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
-topologicpy/Face.py,sha256=tY7H4OJDJeW1Lz2xk8-Jb67IUunPN7M0Y70-2DEOKFc,115278
+topologicpy/Face.py,sha256=d1Im4ogxuaVmZyb6hgv5muwQwahLtGzOar_a3og1a_I,115376
 topologicpy/Graph.py,sha256=p3VoVH6yygNV2wwzpsi4tm6yOfwRbtmsbnsAu2opLjQ,393517
 topologicpy/Grid.py,sha256=3-sn7CHWGcXk18XCnHjsUttNJTWwmN63g_Insj__p04,18218
 topologicpy/Helper.py,sha256=i-AfI29NMsZXBaymjilfvxQbuS3wpYbpPw4RWu1YCHs,16358
@@ -22,14 +22,14 @@ topologicpy/PyG.py,sha256=mDEYYGKv-q1B7GI_J7b3pAbJhF0hqMnITZNMzhHycg4,96097
 topologicpy/Shell.py,sha256=etLWt2VsKOYE-2N0InKdQxLDHEZWsp59DeToSggrjF0,79914
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=InnKtX8eKwtAgcScuABH6yp0ljmWh5m_fDR4-n3jJMY,36869
-topologicpy/Topology.py,sha256=vmRjJDN-d0DzYK4IS0XaVeJh_nRs0BJQ6O7FzFjsoFk,365074
+topologicpy/Topology.py,sha256=5KGQ8jSiURMk9syoMLc3mrIONCfj_pfvCfHTKgPcLOM,366047
 topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
 topologicpy/Vertex.py,sha256=EQdVYHmW85_pZdHZB3N8pEi0GiadCCkF3z_oqohA7B0,71161
-topologicpy/Wire.py,sha256=bYH4BhGkJMqqTokkNO_cbywHZXWU01002Yc_fp_VUD4,153524
+topologicpy/Wire.py,sha256=9EJE0Iq3nGz5X7Suy6xxjmuOpfV49By6WH98UAL_7m4,153532
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=JoIlIhbYajAnUZCjcOyYnv07ExEn_Cn1mAgJwjG2uuI,23
-topologicpy-0.7.40.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.40.dist-info/METADATA,sha256=n097KO8cPKlOVLFXQNaM4a78smH3ciTgouacxirO9qI,10916
-topologicpy-0.7.40.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-topologicpy-0.7.40.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.40.dist-info/RECORD,,
+topologicpy/version.py,sha256=UWZPE9jgOKgWiu1NjdF3GjtgYjFTqvDvq_t-y5kjb-s,23
+topologicpy-0.7.42.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.42.dist-info/METADATA,sha256=NSPc5BzWU_sOnE--u-EnHbDLze91ki3OV6LRtAyEc1k,10916
+topologicpy-0.7.42.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+topologicpy-0.7.42.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.42.dist-info/RECORD,,