topologicpy 0.7.23__py3-none-any.whl → 0.7.24__py3-none-any.whl

topologicpy/CellComplex.py

@@ -91,7 +91,7 @@ class CellComplex():
                                  direction=direction, placement=placement, tolerance=tolerance)
     
     @staticmethod
-    def ByCells(cells: list, tolerance: float = 0.0001, silent: bool = False):
+    def ByCells(cells: list, transferDictionaries = False, tolerance: float = 0.0001, silent: bool = False):
         """
         Creates a cellcomplex by merging the input cells.
 
@@ -99,6 +99,8 @@ class CellComplex():
         ----------
         cells : list
             The list of input cells.
+        transferDictionaries : bool , optional
+            If set to True, any dictionaries in the cells are transferred to the CellComplex. Otherwise, they are not. The default is False.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
@@ -108,8 +110,10 @@ class CellComplex():
             The created cellcomplex.
 
         """
+        from topologicpy.Vertex import Vertex
         from topologicpy.Cluster import Cluster
         from topologicpy.Topology import Topology
+        from topologicpy.Dictionary import Dictionary
 
         if not isinstance(cells, list):
             if not silent:
@@ -120,6 +124,7 @@ class CellComplex():
             if not silent:
                 print("CellComplex.ByCells - Error: The input cells parameter does not contain any valid cells. Returning None.")
             return None
+        cluster = Cluster.ByTopologies(cells)
         cellComplex = None
         if len(cells) == 1:
             return topologic.CellComplex.ByCells(cells) # Hook to Core
@@ -149,6 +154,14 @@ class CellComplex():
                 if not silent:
                     print("CellComplex.ByCells - Warning: Resulting object contains only one cell. Returning object of type topologic_core.Cell instead of topologic_core.CellComplex.")
                 return(temp_cells[0])
+            if transferDictionaries == True:
+                for temp_cell in temp_cells:
+                    v = Topology.InternalVertex(temp_cell)
+                    enclosing_cells = Vertex.EnclosingCell(v, cluster)
+                    dictionaries = [Topology.Dictionary(ec) for ec in enclosing_cells]
+                    d = Dictionary.ByMergedDictionaries(dictionaries, silent=silent)
+                    temp_cell = Topology.SetDictionary(temp_cell, d)
+
         return cellComplex
     
     @staticmethod

topologicpy/Cluster.py

@@ -143,7 +143,7 @@ class Cluster():
         return Cluster.ByTopologies(vertices)
     
     @staticmethod
-    def ByTopologies(*args, transferDictionaries: bool = False):
+    def ByTopologies(*args, transferDictionaries: bool = False, silent=False):
         """
         Creates a topologic Cluster from the input list of topologies. The input can be individual topologies each as an input argument or a list of topologies stored in one input argument.
 
@@ -153,7 +153,8 @@ class Cluster():
             The list of topologies.
         transferDictionaries : bool , optional
             If set to True, the dictionaries from the input topologies are merged and transferred to the cluster. Otherwise they are not. The default is False.
-
+        silent : bool , optional
+            If set to True, error and warning messages are not displayed. Otherwise, they are. The default is False.
         Returns
         -------
         topologic_core.Cluster
@@ -197,7 +198,7 @@ class Cluster():
                     dictionaries.append(d)
         if len(dictionaries) > 0:
             if len(dictionaries) > 1:
-                d = Dictionary.ByMergedDictionaries(dictionaries)
+                d = Dictionary.ByMergedDictionaries(dictionaries, silent=silent)
             else:
                 d = dictionaries[0]
                 cluster = Topology.SetDictionary(cluster, d)

topologicpy/Dictionary.py

@@ -153,7 +153,7 @@ class Dictionary():
         return topologic.Dictionary.ByKeysValues(stl_keys, stl_values) # Hook to Core
     
     @staticmethod
-    def ByMergedDictionaries(*dictionaries):
+    def ByMergedDictionaries(*dictionaries, silent: bool = False):
         """
         Creates a dictionary by merging the list of input dictionaries.
 
@@ -161,6 +161,8 @@ class Dictionary():
         ----------
         dictionaries : list or comma separated dictionaries
             The input list of dictionaries to be merged.
+        silent : bool , optional
+            If set to True, error and warning messages are not displayed. Otherwise, they are. The default is False.
 
         Returns
         -------
@@ -176,13 +178,16 @@ class Dictionary():
         if isinstance(dictionaries, list):
             new_dictionaries = [d for d in dictionaries if Topology.IsInstance(d, "Dictionary")]
         if len(new_dictionaries) == 0:
-            print("Dictionary.ByMergedDictionaries - Error: the input dictionaries parameter does not contain any valid dictionaries. Returning None.")
+            if not silent:
+                print("Dictionary.ByMergedDictionaries - Error: the input dictionaries parameter does not contain any valid dictionaries. Returning None.")
             return None
         if len(new_dictionaries) == 1:
-            print("Dictionary.ByMergedDictionaries - Error: the input dictionaries parameter contains only one dictionary. Returning input dictionary.")
+            if not silent:
+                print("Dictionary.ByMergedDictionaries - Error: the input dictionaries parameter contains only one dictionary. Returning input dictionary.")
             return new_dictionaries[0]
         if not isinstance(new_dictionaries, list):
-            print("Dictionary.ByMergedDictionaries - Error: The input dictionaries parameter is not a valid list. Returning None.")
+            if not silent:
+                print("Dictionary.ByMergedDictionaries - Error: The input dictionaries parameter is not a valid list. Returning None.")
             return None
         return_dictionaries = []
         for d in new_dictionaries:
@@ -191,10 +196,12 @@ class Dictionary():
             elif isinstance(d, dict):
                 return_dictionaries.append(Dictionary.ByPythonDictionary(d))
         if len(return_dictionaries) == 0:
-            print("Dictionary.ByMergedDictionaries - Error: The input dictionaries parameter does not contain valid dictionaries. Returning None.")
+            if not silent:
+                print("Dictionary.ByMergedDictionaries - Error: The input dictionaries parameter does not contain valid dictionaries. Returning None.")
             return None
         elif len(return_dictionaries) == 1:
-            print("Dictionary.ByMergedDictionaries - Warning: The input dictionaries parameter contains only one valid dictionary. Returning that dictionary.")
+            if not silent:
+                print("Dictionary.ByMergedDictionaries - Warning: The input dictionaries parameter contains only one valid dictionary. Returning that dictionary.")
             return new_dictionaries[0]
         else:
             dictionaries = return_dictionaries

topologicpy/Topology.py

@@ -2443,7 +2443,6 @@ class Topology():
 
         def buildCell(json_item, j_shells, j_faces, j_wires, j_edges, j_vertices, uuidKey="uuid", tolerance=0.0001):
             cell_shells = json_item['shells']
-            shells = []
             external_boundary = buildShell(find_json_item(j_shells, uuidKey, cell_shells[0]), j_faces, j_wires, j_edges, j_vertices, uuidKey=uuidKey, tolerance=tolerance)
             internal_boundaries = []
             for j_s in cell_shells[1:]:
@@ -2468,7 +2467,7 @@ class Topology():
             cells = []
             for j_c in cc_cells:
                 cells.append(buildCell(find_json_item(j_cells, uuidKey, j_c), j_shells, j_faces, j_wires, j_edges, j_vertices, uuidKey=uuidKey, tolerance=tolerance))
-            cc = CellComplex.ByCells(cells, tolerance=tolerance)
+            cc = CellComplex.ByCells(cells, transferDictionaries=False, silent=True, tolerance=tolerance)
             if cc == None:
                 print("Topology.ByJSONString - Error: Could not build a cellcomplex. Returning None.")
                 return None
@@ -2645,18 +2644,10 @@ class Topology():
             d = Topology.Dictionary(ev)
             if Dictionary.ValueAtKey(d,'toplevel') == True:
                 toplevelTopologies.append(ev)
-
+        return_topologies = []
         for tp in toplevelTopologies:
             # This is a hack because sometimes the imported topologies get weird. I think it is an opencascade bug.
             tp = Topology.ByBREPString(Topology.BREPString(tp))
-            if len(vertex_selectors) > 0:
-                _ = Topology.TransferDictionariesBySelectors(tp, vertex_selectors, tranVertices=True, tolerance=tolerance)
-            if len(edge_selectors) > 0:
-                _ = Topology.TransferDictionariesBySelectors(tp, edge_selectors, tranEdges=True, tolerance=tolerance)
-            if len(face_selectors) > 0:
-                _ = Topology.TransferDictionariesBySelectors(tp, face_selectors, tranFaces=True, tolerance=tolerance)
-            if len(cell_selectors) > 0:
-                _ = Topology.TransferDictionariesBySelectors(tp, cell_selectors, tranCells=True, tolerance=tolerance)
             if len(all_vertex_apertures) > 0:
                 tp_vertices = Topology.Vertices(tp)
                 for tp_vertex in tp_vertices:
@@ -2673,11 +2664,22 @@ class Topology():
                 tp_cells = Topology.Cells(tp)
                 for tp_cell in tp_cells:
                     tp_cell = setApertures(tp_cell, all_cell_apertures, uuidKey="uuid")
-    
-        if len(toplevelTopologies) == 1:
-            return toplevelTopologies[0]
+
+            if len(vertex_selectors) > 0:
+                _ = Topology.TransferDictionariesBySelectors(tp, vertex_selectors, tranVertices=True, tolerance=tolerance)
+            if len(edge_selectors) > 0:
+                _ = Topology.TransferDictionariesBySelectors(tp, edge_selectors, tranEdges=True, tolerance=tolerance)
+            if len(face_selectors) > 0:
+                _ = Topology.TransferDictionariesBySelectors(tp, face_selectors, tranFaces=True, tolerance=tolerance)
+            if len(cell_selectors) > 0:
+                _ = Topology.TransferDictionariesBySelectors(tp, cell_selectors, tranCells=True, tolerance=tolerance)
+            
+            return_topologies.append(tp)
+            
+        if len(return_topologies) == 1:
+            return return_topologies[0]
         else:
-            return toplevelTopologies
+            return return_topologies
     
     @staticmethod
     def ByJSONPath(path, tolerance=0.0001):
@@ -2711,7 +2713,7 @@ class Topology():
                 defaultOpacity: float = 1.0,
                 transposeAxes: bool = True,
                 removeCoplanarFaces: bool = True,
-                
+                selfMerge: bool = True,
                 mantissa : int = 6,
                 tolerance: float = 0.0001):
         """
@@ -2732,6 +2734,8 @@ class Topology():
             If set to True the Z and Y axes are transposed. Otherwise, they are not. The default is True.
         removeCoplanarFaces : bool , optional
             If set to True, coplanar faces are merged. The default is True.
+        selfMerge : bool , optional
+            If set to True, the faces of the imported topologies will each be self-merged to create higher-dimensional objects. Otherwise, they remain a cluster of faces. The default is False.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         tolerance : float , optional
@@ -2761,12 +2765,14 @@ class Topology():
         return Topology.ByOBJString(obj_string, mtl_string,
                         defaultColor=defaultColor, defaultOpacity=defaultOpacity,
                         transposeAxes=transposeAxes, removeCoplanarFaces=removeCoplanarFaces,
+                        selfMerge=selfMerge,
                         mantissa=mantissa, tolerance=tolerance)
 
     @staticmethod
     def ByOBJPath(objPath,
                   defaultColor: list = [255,255,255], defaultOpacity: float = 1.0,
                   transposeAxes: bool = True, removeCoplanarFaces: bool = True,
+                  selfMerge: bool = False,
                   mantissa : int = 6, tolerance: float = 0.0001):
         """
         Imports a topology from an OBJ file path and an associated materials file.
@@ -2784,6 +2790,8 @@ class Topology():
             If set to True the Z and Y axes are transposed. Otherwise, they are not. The default is True.
         removeCoplanarFaces : bool , optional
             If set to True, coplanar faces are merged. The default is True.
+        selfMerge : bool , optional
+            If set to True, the faces of the imported topologies will each be self-merged to create higher-dimensional objects. Otherwise, they remain a cluster of faces. The default is False.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         tolerance : float , optional
@@ -2824,12 +2832,14 @@ class Topology():
         return Topology.ByOBJString(obj_string, mtl_string,
                         defaultColor=defaultColor, defaultOpacity=defaultOpacity,
                         transposeAxes=transposeAxes, removeCoplanarFaces=removeCoplanarFaces,
+                        selfMerge = selfMerge,
                         mantissa=mantissa, tolerance=tolerance)
 
     @staticmethod
     def ByOBJString(objString: str, mtlString: str = None,
                     defaultColor: list = [255,255,255], defaultOpacity: float = 1.0,
                     transposeAxes: bool = True, removeCoplanarFaces: bool = False,
+                    selfMerge: bool = False,
                     mantissa = 6, tolerance = 0.0001):
         """
         Imports a topology from  OBJ and MTL strings.
@@ -2848,6 +2858,8 @@ class Topology():
             If set to True the Z and Y axes are transposed. Otherwise, they are not. The default is True.
         removeCoplanarFaces : bool , optional
             If set to True, coplanar faces are merged. The default is True.
+        selfMerge : bool , optional
+            If set to True, the faces of the imported topologies will each be self-merged to create higher-dimensional objects. Otherwise, they remain a cluster of faces. The default is False.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
         tolerance : float , optional
@@ -2994,7 +3006,9 @@ class Topology():
                         selector = Topology.SetDictionary(selector, d)
                         face_selectors.append(selector)
 
-            topology = Topology.SelfMerge(Cluster.ByTopologies(object_faces), tolerance=tolerance)
+            topology = Cluster.ByTopologies(object_faces, tolerance=tolerance)
+            if selfMerge:
+                topology = Topology.SelfMerge(topology)
             if removeCoplanarFaces:
                 topology = Topology.RemoveCoplanarFaces(topology, tolerance=tolerance)
             d = Dictionary.ByKeysValues(['name', 'color', 'opacity'], [object_name, object_color, object_opacity])
@@ -7599,6 +7613,10 @@ class Topology():
             The input topology with the dictionaries transferred to its subtopologies.
 
         """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Dictionary import Dictionary
+        from topologicpy.Cluster import Cluster
+        from topologicpy.Plotly import Plotly
         if not Topology.IsInstance(topology, "Topology"):
             print("Topology.TransferDictionariesBySelectors - Error: The input topology parameter is not a valid topology. Returning None.")
             return None
@@ -7639,10 +7657,11 @@ class Topology():
             _ = Topology.TransferDictionaries(selectors, sinkFaces, tolerance=tolerance, numWorkers=numWorkers)
         if tranCells == True:
             sinkCells = []
-            if Topology.Type(topology) == Topology.TypeID("Cell"):
-                sinkCells.append(topology)
+            if Topology.IsInstance(topology, "Cell"):
+                sinkCells = [topology]
             elif hidimSink >= Topology.TypeID("Cell"):
-                topology.Cells(None, sinkCells)
+                print("Transfering Dictionaries to Cells")
+                sinkCells = Topology.Cells(topology)
             _ = Topology.TransferDictionaries(selectors, sinkCells, tolerance=tolerance, numWorkers=numWorkers)
         return topology
 

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.23'
+__version__ = '0.7.24'

{topologicpy-0.7.23.dist-info → topologicpy-0.7.24.dist-info}/METADATA

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

@@ -1,12 +1,12 @@
 topologicpy/ANN.py,sha256=CLK6kPV28ag-hc60pyqoXt4GPiYQDUL8N48tjAbZ9Do,48981
 topologicpy/Aperture.py,sha256=p9pUzTQSBWoUaDiug1V1R1hnEIEwYSXFg2t7iRAmNRY,2723
 topologicpy/Cell.py,sha256=NjcKAqZywkr7DouYP4MGLhG6grWrXYfEpzDgUN-qAC0,99802
-topologicpy/CellComplex.py,sha256=-f-O5lcz0nSNcjw89XYi3IYhZRrbzojG11dItpISI_U,47401
-topologicpy/Cluster.py,sha256=6ZKtS82E2gCkX3oQKbx_aYL1GDiLYkleQbWWK5wYP7U,54815
+topologicpy/CellComplex.py,sha256=x474N-lo1krpdIGrWRAFRdDup5a_1V-mLORTS6ZGZ7M,48227
+topologicpy/Cluster.py,sha256=mwQVNXnh20VHms0ZqPzTROP8bUdVt8CTKtaNobAqHsE,54993
 topologicpy/Color.py,sha256=UlmRcCSOhqcM_OyMWz4t3Kr75KcgXDhz3uctAJ2n7Ic,18031
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
-topologicpy/Dictionary.py,sha256=R6dqA2hqJX5t8faZmXCen8Cn3ukJ8VCHkyk-bune7-E,26770
+topologicpy/Dictionary.py,sha256=4VtIT1p4UHWButzRUnajj16V0DY-d5RaENbXLNTbCYU,27097
 topologicpy/Edge.py,sha256=QHXb0R9bdPHfHhi64rXrCeeFoLv8iaMeBxqvocBm1XI,58327
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
 topologicpy/Face.py,sha256=XS2ODccQRQvIdeuKAydjyAJmNqkwm8-RJJ5M1l4gt68,109523
@@ -21,14 +21,14 @@ topologicpy/Polyskel.py,sha256=4R5_DEdfrmi-4gR6axHNoHTCSAE2TCekOyN8jvb7bHQ,19722
 topologicpy/Shell.py,sha256=szuwRbQeHH9jd2X-DA9UhYAL_mzgfr_ctGrrQL2reWg,79917
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=_gZfVyH0SDLQmmt775UeeAJ_BtwXO1STQnUMV1qkU0s,37161
-topologicpy/Topology.py,sha256=EAu5bQl69c1n5KkJE1V2bapeEQsaCDL-ms0r-KzM35w,349215
+topologicpy/Topology.py,sha256=OcNf5bZunNwLlJ8IiFPjcWmUBbtr3idgwYDazyBK4Pk,350515
 topologicpy/Vector.py,sha256=JAIeOZplh7sQD46K4eP3gMgvK6iB1wwpZ0sC9-FFGq8,32803
 topologicpy/Vertex.py,sha256=deOrCOvvGJYAludUE4Tm_L4Bx0ykQzO_ddnYSrUzsBs,71157
 topologicpy/Wire.py,sha256=_-0s6lFCStTGEjK5M-_w79UCQoPVFH1Ou8PdH_urvT0,145180
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=N6Bti6avPpwylwTGFsJIizCk0diNen56ql7y-MCAT6U,23
-topologicpy-0.7.23.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
-topologicpy-0.7.23.dist-info/METADATA,sha256=Km1K1jcxZhheChH715Z3gtb76475mzJZtqu-aJm2Y78,10916
-topologicpy-0.7.23.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-topologicpy-0.7.23.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.23.dist-info/RECORD,,
+topologicpy/version.py,sha256=V0wSjRUUY2SPu2U3wOLkXUyScb5-aD_z0apG3LR4-SY,23
+topologicpy-0.7.24.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.24.dist-info/METADATA,sha256=C2gipIo8TAoRMeSosO1tXrLPkY5xPEiIprMpiku3JUI,10916
+topologicpy-0.7.24.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+topologicpy-0.7.24.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.24.dist-info/RECORD,,

{topologicpy-0.7.23.dist-info → topologicpy-0.7.24.dist-info}/WHEEL

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