topologicpy 0.8.4__py3-none-any.whl → 0.8.7__py3-none-any.whl

topologicpy/Graph.py

@@ -2624,6 +2624,10 @@ class Graph:
                 # Store relevant information
                 if transferDictionaries == True:
                     color, transparency, material_list = get_color_transparency_material(ifc_object)
+                    if color == None:
+                        color = "white"
+                    if transparency == None:
+                        transparency = 0
                     entity_dict = {
                         "TOPOLOGIC_id": str(Topology.UUID(centroid)),
                         "TOPOLOGIC_name": getattr(ifc_object, 'Name', "Untitled"),
@@ -2645,19 +2649,22 @@ class Graph:
                         if hasattr(ifc_object, "Representation") and ifc_object.Representation:
                             for rep in ifc_object.Representation.Representations:
                                 if rep.is_a("IfcShapeRepresentation"):
-                                    # Generate the geometry for this entity
-                                    shape = ifcopenshell.geom.create_shape(settings, ifc_object)
-                                    # Get grouped vertices and grouped faces     
-                                    grouped_verts = shape.geometry.verts
-                                    verts = [ [grouped_verts[i], grouped_verts[i + 1], grouped_verts[i + 2]] for i in range(0, len(grouped_verts), 3)]
-                                    grouped_edges = shape.geometry.edges
-                                    edges = [[grouped_edges[i], grouped_edges[i + 1]] for i in range(0, len(grouped_edges), 2)]
-                                    grouped_faces = shape.geometry.faces
-                                    faces = [ [grouped_faces[i], grouped_faces[i + 1], grouped_faces[i + 2]] for i in range(0, len(grouped_faces), 3)]
-                                    shape_topology = Topology.ByGeometry(verts, edges, faces, silent=True)
-                                    if not shape_topology == None:
-                                        if removeCoplanarFaces == True:
-                                            shape_topology = Topology.RemoveCoplanarFaces(shape_topology, epsilon=0.0001)
+                                    try:
+                                        # Generate the geometry for this entity
+                                        shape = ifcopenshell.geom.create_shape(settings, ifc_object)
+                                        # Get grouped vertices and grouped faces     
+                                        grouped_verts = shape.geometry.verts
+                                        verts = [ [grouped_verts[i], grouped_verts[i + 1], grouped_verts[i + 2]] for i in range(0, len(grouped_verts), 3)]
+                                        grouped_edges = shape.geometry.edges
+                                        edges = [[grouped_edges[i], grouped_edges[i + 1]] for i in range(0, len(grouped_edges), 2)]
+                                        grouped_faces = shape.geometry.faces
+                                        faces = [ [grouped_faces[i], grouped_faces[i + 1], grouped_faces[i + 2]] for i in range(0, len(grouped_faces), 3)]
+                                        shape_topology = Topology.ByGeometry(verts, edges, faces, silent=True)
+                                        if not shape_topology == None:
+                                            if removeCoplanarFaces == True:
+                                                shape_topology = Topology.RemoveCoplanarFaces(shape_topology, epsilon=0.0001)
+                                    except:
+                                        pass
                         if not shape_topology == None and storeBREP:
                             topology_dict = Dictionary.SetValuesAtKeys(topology_dict, ["brep", "brepType", "brepTypeString"], [Topology.BREPString(shape_topology), Topology.Type(shape_topology), Topology.TypeAsString(shape_topology)])
                         if not shape_topology == None and useInternalVertex == True:

topologicpy/Topology.py

@@ -2515,50 +2515,55 @@ class Topology():
         def convert_to_topology(entity, settings, transferDictionaries=False):    
             if hasattr(entity, "Representation") and entity.Representation:
                 for rep in entity.Representation.Representations:
+                    shape_topology = None
                     if rep.is_a("IfcShapeRepresentation"):
                         # Generate the geometry for this entity
-                        shape = ifcopenshell.geom.create_shape(settings, entity)
                         try:
+                            shape = ifcopenshell.geom.create_shape(settings, entity)
                             trans = shape.transformation
                             # Convert into a 4x4 matrix
                             matrix = [trans.matrix[i:i+4] for i in range(0, len(trans.matrix), 4)]
+                            # Get grouped vertices and grouped faces     
+                            grouped_verts = shape.geometry.verts
+                            verts = [ [grouped_verts[i], grouped_verts[i + 1], grouped_verts[i + 2]] for i in range(0, len(grouped_verts), 3)]
+                            grouped_edges = shape.geometry.edges
+                            edges = [[grouped_edges[i], grouped_edges[i + 1]] for i in range(0, len(grouped_edges), 2)]
+                            grouped_faces = shape.geometry.faces
+                            faces = [ [grouped_faces[i], grouped_faces[i + 1], grouped_faces[i + 2]] for i in range(0, len(grouped_faces), 3)]
+                            #shape_topology = ifc_to_topologic_geometry(verts, edges, faces)
+                            #shape_topology = Topology.SelfMerge(Topology.ByGeometry(verts, edges, faces))
+                            shape_topology = Topology.ByGeometry(verts, edges, faces, silent=True)
+                            if not shape_topology == None:
+                                if removeCoplanarFaces == True:
+                                    shape_topology = Topology.RemoveCoplanarFaces(shape_topology, epsilon=0.0001)
+                                shape_topology = Topology.Transform(shape_topology, matrix)
+
+                                # Store relevant information
+                                if transferDictionaries == True:
+                                    color, transparency, material_list = get_color_transparency_material(entity)
+                                    if color == None:
+                                        color = "white"
+                                    if transparency == None:
+                                        transparency = 0
+                                    entity_dict = {
+                                        "TOPOLOGIC_id": str(Topology.UUID(shape_topology)),
+                                        "TOPOLOGIC_name": getattr(entity, 'Name', "Untitled"),
+                                        "TOPOLOGIC_type": Topology.TypeAsString(shape_topology),
+                                        "TOPOLOGIC_color": color,
+                                        "TOPOLOGIC_opacity": 1.0 - transparency,
+                                        "IFC_global_id": getattr(entity, 'GlobalId', 0),
+                                        "IFC_name": getattr(entity, 'Name', "Untitled"),
+                                        "IFC_type": entity.is_a(),
+                                        "IFC_material_list": material_list,
+                                    }
+                                    topology_dict = Dictionary.ByPythonDictionary(entity_dict)
+                                    # Get PSETs dictionary
+                                    pset_python_dict = get_psets(entity)
+                                    pset_dict = Dictionary.ByPythonDictionary(pset_python_dict)
+                                    topology_dict = Dictionary.ByMergedDictionaries([topology_dict, pset_dict])
+                                    shape_topology = Topology.SetDictionary(shape_topology, topology_dict)
                         except:
                             pass
-                        # Get grouped vertices and grouped faces     
-                        grouped_verts = shape.geometry.verts
-                        verts = [ [grouped_verts[i], grouped_verts[i + 1], grouped_verts[i + 2]] for i in range(0, len(grouped_verts), 3)]
-                        grouped_edges = shape.geometry.edges
-                        edges = [[grouped_edges[i], grouped_edges[i + 1]] for i in range(0, len(grouped_edges), 2)]
-                        grouped_faces = shape.geometry.faces
-                        faces = [ [grouped_faces[i], grouped_faces[i + 1], grouped_faces[i + 2]] for i in range(0, len(grouped_faces), 3)]
-                        #shape_topology = ifc_to_topologic_geometry(verts, edges, faces)
-                        #shape_topology = Topology.SelfMerge(Topology.ByGeometry(verts, edges, faces))
-                        shape_topology = Topology.ByGeometry(verts, edges, faces, silent=True)
-                        if not shape_topology == None:
-                            if removeCoplanarFaces == True:
-                                shape_topology = Topology.RemoveCoplanarFaces(shape_topology, epsilon=0.0001)
-                            shape_topology = Topology.Transform(shape_topology, matrix)
-
-                            # Store relevant information
-                            if transferDictionaries == True:
-                                color, transparency, material_list = get_color_transparency_material(entity)
-                                entity_dict = {
-                                    "TOPOLOGIC_id": str(Topology.UUID(shape_topology)),
-                                    "TOPOLOGIC_name": getattr(entity, 'Name', "Untitled"),
-                                    "TOPOLOGIC_type": Topology.TypeAsString(shape_topology),
-                                    "TOPOLOGIC_color": color,
-                                    "TOPOLOGIC_opacity": 1.0 - transparency,
-                                    "IFC_global_id": getattr(entity, 'GlobalId', 0),
-                                    "IFC_name": getattr(entity, 'Name', "Untitled"),
-                                    "IFC_type": entity.is_a(),
-                                    "IFC_material_list": material_list,
-                                }
-                                topology_dict = Dictionary.ByPythonDictionary(entity_dict)
-                                # Get PSETs dictionary
-                                pset_python_dict = get_psets(entity)
-                                pset_dict = Dictionary.ByPythonDictionary(pset_python_dict)
-                                topology_dict = Dictionary.ByMergedDictionaries([topology_dict, pset_dict])
-                                shape_topology = Topology.SetDictionary(shape_topology, topology_dict)
                         return shape_topology
             return None
 
@@ -4195,8 +4200,10 @@ class Topology():
         if normalize == False:
             scale_factor = 1.0
         else:
-            edges = Topology.Edges(translated_top)
-            max_edge_length = max([Edge.Length(edge, mantissa=mantissa) for edge in edges])
+            #edges = Topology.Edges(translated_top)
+            #max_edge_length = max([Edge.Length(edge, mantissa=mantissa) for edge in edges])
+            longest_edges = Topology.LongestEdges(translated_top, removeCoplanarFaces=True)
+            max_edge_length = Edge.Length(longest_edges[0])
             scale_factor = 1.0 / max_edge_length if max_edge_length != 0 else 1.0
         scaling_matrix = Matrix.ByScaling(scaleX=scale_factor, scaleY=scale_factor, scaleZ=scale_factor)
         scaled_top = Topology.Scale(translated_top, origin=Vertex.Origin(), x=scale_factor, y=scale_factor, z=scale_factor)

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.8.4'
+__version__ = '0.8.7'

{topologicpy-0.8.4.dist-info → topologicpy-0.8.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: topologicpy
-Version: 0.8.4
+Version: 0.8.7
 Summary: An AI-Powered Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: AGPL v3 License

{topologicpy-0.8.4.dist-info → topologicpy-0.8.7.dist-info}/RECORD

@@ -11,7 +11,7 @@ topologicpy/Dictionary.py,sha256=t0O7Du-iPq46FyKqZfcjHfsUK1E8GS_e67R2V5cpkbw,331
 topologicpy/Edge.py,sha256=lWwJdQkAhiH5POB7TN6HSLv03g2jXHzBU7e2fE3eAno,71340
 topologicpy/EnergyModel.py,sha256=UoQ9Jm-hYsN383CbcLKw-y6BKitRHj0uyh84yQ-8ACg,53856
 topologicpy/Face.py,sha256=D1g4O5i5QMPZvIoX06Z-FsyNsYBDkCiHWJp00uqnr5o,180742
-topologicpy/Graph.py,sha256=T_NC-Gvf7F7DWdfWvQB7sQ_v790lTT74SLKTl-UhSZE,492072
+topologicpy/Graph.py,sha256=rq7QGgb2eTJucFT6YeQujs1zoZg-KHMvHOWPjG1btG4,492418
 topologicpy/Grid.py,sha256=2s9cSlWldivn1i9EUz4OOokJyANveqmRe_vR93CAndI,18245
 topologicpy/Helper.py,sha256=DAAE_Ie_ekeMnCvcW08xXRwSAGCkjrS4lbz-o3ELuY4,27172
 topologicpy/Honeybee.py,sha256=Y_El6M8x3ixvvIe_VcRiwj_4C89ZZg5_WlT7adbCkpw,21849
@@ -23,14 +23,14 @@ topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
 topologicpy/Shell.py,sha256=fLRnQ79vtdBDRW1Xn8Gaap34XheGbw7UBFd-ALJ2Y1g,87978
 topologicpy/Speckle.py,sha256=AlsGlSDuKRtX5jhVsPNSSjjbZis079HbUchDH_5RJmE,18187
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=IHLJxh0TQ7P8Git4qfFDlvas81JXaKQGjxwgBzIX1T0,463367
+topologicpy/Topology.py,sha256=qw64d3Ct6u7W8Fy_-JIg3_xsyOzDIQ1hdnpxF2p_wH4,463931
 topologicpy/Vector.py,sha256=Cl7besf20cAGmyNPh-9gbFAHnRU5ZWSMChJ3VyFIDs4,35416
 topologicpy/Vertex.py,sha256=tv6C-rbuNgXHDGgVLT5fbalynLdXqlUuiCDKtkeQ0vk,77814
 topologicpy/Wire.py,sha256=Gl3Jpygwp8775SG57ua5r5ffTHcN4FOAkeI87yP1cok,234001
 topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
-topologicpy/version.py,sha256=PtH7P3DXedvpK4LWSSxCTW38cmEXvmG6EvUpXZC-eLo,22
-topologicpy-0.8.4.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.8.4.dist-info/METADATA,sha256=WsO5JswYFeodLDlAb5Jv9TnaIhSl0z2ge2fhH-3hLpw,10512
-topologicpy-0.8.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-topologicpy-0.8.4.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.8.4.dist-info/RECORD,,
+topologicpy/version.py,sha256=JGCf_Ym2Ht0sZ3u8dNB1-xTLbDj-N0D-i99vGQQMfWs,22
+topologicpy-0.8.7.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.8.7.dist-info/METADATA,sha256=uDBR73QF2TnGhpaMNI-vIBGeZTF-c7IMM5DI7AxwzEI,10512
+topologicpy-0.8.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+topologicpy-0.8.7.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.8.7.dist-info/RECORD,,