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

topologicpy/Topology.py

@@ -2227,6 +2227,8 @@ class Topology():
         from topologicpy.Cluster import Cluster
         from topologicpy.Dictionary import Dictionary
         import uuid
+        import random
+        import hashlib
         
         try:
             import ifcopenshell
@@ -2247,34 +2249,72 @@ class Topology():
         if not file:
             print("Topology.ByIFCFile - Error: the input file parameter is not a valid file. Returning None.")
             return None
+        
+        # Function to generate a unique random color based on material ID
+        def generate_color_for_material(material_id):
+            # Use a hash function to get a consistent "random" seed
+            hash_object = hashlib.sha1(material_id.encode())
+            seed = int(hash_object.hexdigest(), 16) % (10 ** 8)
+            random.seed(seed)
+            # Generate a random color
+            r = random.random()
+            g = random.random()
+            b = random.random()
+            return [r, g, b]
+        
+        # Function to get the material IDs associated with an entity
+        def get_material_ids_of_entity(entity):
+            material_name = "None"
+            material_ids = []
+            if hasattr(entity, "HasAssociations"):
+                for association in entity.HasAssociations:
+                    if association.is_a("IfcRelAssociatesMaterial"):
+                        material = association.RelatingMaterial
+                        material_name = material.Name
+                        if material.is_a("IfcMaterial"):
+                            material_ids.append(material.id())
+                        elif material.is_a("IfcMaterialList"):
+                            for mat in material.Materials:
+                                material_ids.append(mat.id())
+                        elif material.is_a("IfcMaterialLayerSetUsage") or material.is_a("IfcMaterialLayerSet"):
+                            for layer in material.ForLayerSet.MaterialLayers:
+                                material_ids.append(layer.Material.id())
+                        elif material.is_a("IfcMaterialConstituentSet"):
+                            for constituent in material.MaterialConstituents:
+                                material_ids.append(constituent.Material.id())
+            
+            return material_ids, material_name
+        
+        
+        
         includeTypes = [s.lower() for s in includeTypes]
         excludeTypes = [s.lower() for s in excludeTypes]
         topologies = []
         settings = ifcopenshell.geom.settings()
         settings.set("dimensionality", ifcopenshell.ifcopenshell_wrapper.CURVES_SURFACES_AND_SOLIDS)
         settings.set(settings.USE_WORLD_COORDS, 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):                    
-                    try:
+        #iterator = ifcopenshell.geom.iterator(settings, file, multiprocessing.cpu_count())
+        for entity in file.by_type('IfcProduct'):  # You might want to refine the types you check
+                if hasattr(entity, "Representation") and entity.Representation:
+                    for rep in entity.Representation.Representations:
+                        if rep.is_a("IfcShapeRepresentation"):
+                            # Generate the geometry for this entity
+                            shape = ifcopenshell.geom.create_shape(settings, entity)
+                    is_a = shape.type.lower()
+                    if (is_a in includeTypes or len(includeTypes) == 0) and (not is_a in excludeTypes):
                         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)
+                        topology = Topology.SelfMerge(Topology.ByGeometry(grouped_verts, grouped_edges, grouped_faces))
                         if removeCoplanarFaces:
                             topology = Topology.RemoveCoplanarFaces(topology)
                         topologies.append(topology)
                         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")
@@ -2291,13 +2331,17 @@ class Topology():
                             values.append(shape.name)
                             keys.append("IFC_type")
                             values.append(shape.type)
+                            material_ids, material_name = get_material_ids_of_entity(entity)
+                            keys.append("IFC_material_ids")
+                            values.append(material_ids)
+                            keys.append("IFC_material_name")
+                            values.append(material_name)
+                            keys.append("TOPOLOGIC_color")
+                            color = generate_color_for_material(str(material_ids))
+                            values.append(color)
                             d = Dictionary.ByKeysValues(keys, values)
                             topology = Topology.SetDictionary(topology, d)
                         topologies.append(topology)
-                    except:
-                        pass
-                if not iterator.next():
-                    break
         return topologies
 
     @staticmethod

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.49'
+__version__ = '0.7.50'

{topologicpy-0.7.49.dist-info → topologicpy-0.7.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.49
+Version: 0.7.50
 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.49.dist-info → topologicpy-0.7.50.dist-info}/RECORD

@@ -22,14 +22,14 @@ topologicpy/PyG.py,sha256=3U59QObO56EBwrvaplGeLZhbTao0gJCYhWm3oTpjFAE,109505
 topologicpy/Shell.py,sha256=joahFtpRQTWJpQOmi3qU4Xe0Sx2XXeayHlXTNx8CzMk,87610
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=j_1vCdrOMRi525lqFn63hIJYuD3ZQ8AhHiB8vIiz0zU,379524
+topologicpy/Topology.py,sha256=NONehbPs2Z0J-BaQXRUChCZfTzJSzVngkhojKSxSij8,382087
 topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
 topologicpy/Vertex.py,sha256=bLY60YWoMsgCgHk7F7k9F93Sq2FJ6AzUcTfJ83NZfHA,71107
 topologicpy/Wire.py,sha256=9EJE0Iq3nGz5X7Suy6xxjmuOpfV49By6WH98UAL_7m4,153532
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=hRb_Cf1UnQBFBHqRUC49s9X_xlGuyOLU_zTL7Xm-1Oc,23
-topologicpy-0.7.49.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.49.dist-info/METADATA,sha256=yp1EQDMypWHv6U5kmf0R7RFA8gAc9eX2fxfHqKA7FHw,10918
-topologicpy-0.7.49.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-topologicpy-0.7.49.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.49.dist-info/RECORD,,
+topologicpy/version.py,sha256=gEkNhj8f1k7FiRl8ltgMlJxkt4i1ODTsl0_a2BsR4wI,23
+topologicpy-0.7.50.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.50.dist-info/METADATA,sha256=bQrEvJSs5DBgeaLDmx_HZPF_Qz_rZCXSLa3YUuOa33s,10918
+topologicpy-0.7.50.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+topologicpy-0.7.50.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.50.dist-info/RECORD,,

{topologicpy-0.7.49.dist-info → topologicpy-0.7.50.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any