topologicpy 0.7.60__py3-none-any.whl → 0.7.61__py3-none-any.whl

topologicpy/Topology.py

@@ -2382,7 +2382,7 @@ class Topology():
         
         """
 
-        import ifcopenshell
+        import ifcopenshell, ifcopenshell.geom
         from topologicpy.Dictionary import Dictionary
 
         def get_psets(entity):
@@ -2399,22 +2399,23 @@ class Topology():
                     property_set = definition.RelatingPropertyDefinition
                     
                     # Check if it is a property set
-                    if property_set.is_a('IfcPropertySet'):
-                        pset_name = "IFC_"+property_set.Name
-                        
-                        # Dictionary to hold individual properties
-                        properties = {}
-                        
-                        # Iterate over the properties in the PSET
-                        for prop in property_set.HasProperties:
-                            if prop.is_a('IfcPropertySingleValue'):
-                                # Get the property name and value
-                                prop_name = "IFC_"+prop.Name
-                                prop_value = prop.NominalValue.wrappedValue if prop.NominalValue else None
-                                properties[prop_name] = prop_value
-                        
-                        # Add this PSET to the dictionary for this entity
-                        psets[pset_name] = properties
+                    if not property_set == None:
+                        if property_set.is_a('IfcPropertySet'):
+                            pset_name = "IFC_"+property_set.Name
+                            
+                            # Dictionary to hold individual properties
+                            properties = {}
+                            
+                            # Iterate over the properties in the PSET
+                            for prop in property_set.HasProperties:
+                                if prop.is_a('IfcPropertySingleValue'):
+                                    # Get the property name and value
+                                    prop_name = "IFC_"+prop.Name
+                                    prop_value = prop.NominalValue.wrappedValue if prop.NominalValue else None
+                                    properties[prop_name] = prop_value
+                            
+                            # Add this PSET to the dictionary for this entity
+                            psets[pset_name] = properties
             return psets
         
         def get_color_transparency_material(entity):
@@ -2549,7 +2550,7 @@ class Topology():
         # Main Code
         topologies = []
         settings = ifcopenshell.geom.settings()
-        settings.set("dimensionality", ifcopenshell.ifcopenshell_wrapper.SOLID)
+        #settings.set("dimensionality", ifcopenshell.ifcopenshell_wrapper.SOLID)
         settings.set(settings.USE_WORLD_COORDS, True)
         products = file.by_type("IfcProduct")
         entities = []
@@ -3110,7 +3111,8 @@ class Topology():
         edge_apertures = []
         face_apertures = []
         # Step 2: Create Entities and handle apertures
-        for entity in string:
+        json_dictionary = json.loads(string)
+        for entity in json_dictionary:
             entity_type = entity['type']
             entity_dict = Dictionary.ByKeysValues(keys=list(entity['dictionary'].keys()),
                                                 values=list(entity['dictionary'].values()))
@@ -4281,7 +4283,7 @@ class Topology():
         return topologyA
     
     @staticmethod
-    def Explode(topology, origin=None, scale: float = 1.25, typeFilter: str = None, axes: str = "xyz", mantissa: int = 6, tolerance: float = 0.0001):
+    def Explode(topology, origin=None, scale: float = 1.25, typeFilter: str = None, axes: str = "xyz", transferDictionaries: bool = False, mantissa: int = 6, tolerance: float = 0.0001):
         """
         Explodes the input topology. See https://en.wikipedia.org/wiki/Exploded-view_drawing.
 
@@ -4297,6 +4299,8 @@ class Topology():
             The type of the subtopologies to explode. This can be any of "vertex", "edge", "face", or "cell". If set to None, a subtopology one level below the type of the input topology will be used. The default is None.
         axes : str , optional
             Sets what axes are to be used for exploding the topology. This can be any permutation or substring of "xyz". It is not case sensitive. The default is "xyz".
+        transferDictionaries : bool , optional
+            If set to True, the dictionaries of the original subTopologies are transferred to the exploded topologies. Otherwise, they are not. The default is False.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         tolerance : float , optional
@@ -4311,6 +4315,7 @@ class Topology():
         from topologicpy.Vertex import Vertex
         from topologicpy.Cluster import Cluster
         from topologicpy.Graph import Graph
+        from topologicpy.Dictionary import Dictionary
 
         def processClusterTypeFilter(cluster):
             if len(Cluster.CellComplexes(cluster)) > 0:
@@ -4365,7 +4370,7 @@ class Topology():
             return None
         if Topology.IsInstance(topology, "Topology"):
             # Hack to fix a weird bug that seems to be a problem with OCCT memory handling.
-            topology = Topology.ByBREPString(Topology.BREPString(topology))
+            topology = Topology.ByJSONString(Topology.JSONString([topology]))[0]
         axes = axes.lower()
         x_flag = "x" in axes
         y_flag = "y" in axes
@@ -4403,7 +4408,10 @@ class Topology():
             xT = newX - oldX
             yT = newY - oldY
             zT = newZ - oldZ
-            newTopology = Topology.Translate(aTopology, xT, yT, zT)
+            newTopology = Topology.Copy(aTopology)
+            newTopology = Topology.Translate(newTopology, xT, yT, zT)
+            if transferDictionaries == True:
+                newTopology = Topology.SetDictionary(newTopology, Topology.Dictionary(aTopology))
             newTopologies.append(newTopology)
         return Cluster.ByTopologies(newTopologies)
     

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.60'
+__version__ = '0.7.61'

{topologicpy-0.7.60.dist-info → topologicpy-0.7.61.dist-info}/METADATA

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

@@ -23,14 +23,14 @@ topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
 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=cFYSb93kxqcsdGLdeVcdE9td-KZ9X967sEn98NQAYfM,397243
+topologicpy/Topology.py,sha256=5Vnn9oMEQ__ta_ew9XhnZExMPbHsj9QN91v-6pxdrJg,397934
 topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
 topologicpy/Vertex.py,sha256=bLY60YWoMsgCgHk7F7k9F93Sq2FJ6AzUcTfJ83NZfHA,71107
 topologicpy/Wire.py,sha256=rGLAwjd5p80rxvkOkcrE1MPXkU9oZ1iRK7n_wOTLbd0,162382
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=OPMe-rPXSkz9Cu9DTdHOcBcmqfzAZp01-uadL4eOXFY,23
-topologicpy-0.7.60.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.60.dist-info/METADATA,sha256=zVoxaGqEvSXMGH8W2SJlq4eqAF7XCCZDWEDTjPSSNhw,10918
-topologicpy-0.7.60.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-topologicpy-0.7.60.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.60.dist-info/RECORD,,
+topologicpy/version.py,sha256=tiB10UwHe_W_etMVnPuXlVWgr8S2BBgwOuFocOXK4Nk,23
+topologicpy-0.7.61.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.61.dist-info/METADATA,sha256=Dcv499yRgltilHs2CTCeo3Ktv7lA4HOZWL8wsVT5Tpg,10918
+topologicpy-0.7.61.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+topologicpy-0.7.61.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.61.dist-info/RECORD,,