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

topologicpy/ANN.py

@@ -110,7 +110,7 @@ import numpy as np
 class _ANN(nn.Module):
     def __init__(self, input_size, hyperparameters, dataset=None):
         super(_ANN, self).__init__()
-        self.title = hyperparameters['title']
+        self.title =  hyperparameters.get('title', 'Untitled')
         self.task_type = hyperparameters['task_type']
         self.cross_val_type = hyperparameters['cross_val_type']
         self.k_folds = hyperparameters.get('k_folds', 5)
@@ -576,6 +576,10 @@ class ANN():
                         interval = 1,
                         mantissa = 6):
         """
+        Returns a Hyperparameters dictionary based on the input parameters.
+
+        Parameters
+        ----------
         title : str , optional
             The desired title for the dataset. The default is "Untitled".
         taskType : str , optional
@@ -623,6 +627,7 @@ class ANN():
         -------
         dict
             Returns a dictionary with the following keys:
+            'title'
             'task_type'
             'test_ratio'
             'validation_ratio'
@@ -632,13 +637,14 @@ class ANN():
             'batch_size'
             'early_stopping'
             'patience'
-            'random_tate'
+            'random_state'
             'cross_val_type'
             'kFolds'
             'interval'
             'mantissa'
         """
         return {
+                'title': title,
                 'task_type': taskType,
                 'test_ratio': testRatio,
                 'validation_ratio': validationRatio,

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/Edge.py

@@ -475,6 +475,8 @@ class Edge():
             The first input edge. This edge will be extended to meet edgeB.
         edgeB : topologic_core.Edge
             The second input edge. This edge will be used to extend edgeA.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
         silent : bool , optional
@@ -764,8 +766,8 @@ class Edge():
             The second input edge.
         mantissa : int , optional
             The desired length of the mantissa. The default is 6.
-        angTolerance : float , optional
-            The angular tolerance used for the test. The default is 0.1.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
 
         Returns
         -------

topologicpy/Face.py

@@ -133,6 +133,10 @@ class Face():
             return None
         dirA = Face.Normal(faceA, outputType="xyz", mantissa=3)
         dirB = Face.Normal(faceB, outputType="xyz", mantissa=3)
+        if dirA == None or dirB == None:
+            Topology.Show(faceA, faceB)
+            print("Face.Angle - Error: Could not compute the angle between the two input faces. Returning None.")
+            return None
         return round((Vector.Angle(dirA, dirB)), mantissa)
 
     @staticmethod
@@ -1684,6 +1688,7 @@ class Face():
         from topologicpy.Vertex import Vertex
         import os
         import warnings
+
         try:
             import numpy as np
         except:
@@ -1703,60 +1708,64 @@ class Face():
             print("Face.Normal - Error: The input face parameter is not a valid face. Returning None.")
             return None
         
-        #vertices = Topology.Vertices(face)
-        v1 = Face.VertexByParameters(face, u=0, v=0)
-        v2 = Face.VertexByParameters(face, u=1, v=0)
-        v3 = Face.VertexByParameters(face, u=1, v=1)
-        vertices = [v1, v2, v3]
-        vertices = [Vertex.Coordinates(v, mantissa=mantissa) for v in vertices]
-        
-        if len(vertices) < 3:
-            print("Face.Normal - Error: At least three vertices are required to define a plane. Returning None.")
-            return None
-        
-        # Convert vertices to numpy array for easier manipulation
-        vertices = np.array(vertices)
-        
-        # Try to find two non-collinear edge vectors
-        vec1 = None
-        vec2 = None
-        for i in range(1, len(vertices)):
-            for j in range(i + 1, len(vertices)):
-                temp_vec1 = vertices[i] - vertices[0]
-                temp_vec2 = vertices[j] - vertices[0]
-                cross_product = np.cross(temp_vec1, temp_vec2)
-                if np.linalg.norm(cross_product) > 1e-6:  # Check if the cross product is not near zero
-                    vec1 = temp_vec1
-                    vec2 = temp_vec2
+        return_normal = None
+        try:
+            return_normal = list(topologic.FaceUtility.NormalAtParameters(face, 0.5, 0.5))
+        except:
+            vertices = Topology.Vertices(face)+Topology.Centroid(face)
+            #v1 = Face.VertexByParameters(face, u=0, v=0)
+            #v2 = Face.VertexByParameters(face, u=1, v=0)
+            #v3 = Face.VertexByParameters(face, u=1, v=1)
+            #vertices = [v1, v2, v3]
+            vertices = [Vertex.Coordinates(v, mantissa=mantissa) for v in vertices]
+            
+            if len(vertices) < 3:
+                print("Face.Normal - Error: At least three vertices are required to define a plane. Returning None.")
+                return None
+            
+            # Convert vertices to numpy array for easier manipulation
+            vertices = np.array(vertices)
+            
+            # Try to find two non-collinear edge vectors
+            vec1 = None
+            vec2 = None
+            for i in range(1, len(vertices)):
+                for j in range(i + 1, len(vertices)):
+                    temp_vec1 = vertices[i] - vertices[0]
+                    temp_vec2 = vertices[j] - vertices[0]
+                    cross_product = np.cross(temp_vec1, temp_vec2)
+                    if np.linalg.norm(cross_product) > 1e-6:  # Check if the cross product is not near zero
+                        vec1 = temp_vec1
+                        vec2 = temp_vec2
+                        break
+                if vec1 is not None and vec2 is not None:
                     break
-            if vec1 is not None and vec2 is not None:
-                break
-        
-        if vec1 is None or vec2 is None:
-            print("Face.Normal - Error: The given vertices do not form a valid plane (all vertices might be collinear). Returning None.")
-            return None
-        
-        # Calculate the cross product of the two edge vectors
-        normal = np.cross(vec1, vec2)
+            
+            if vec1 is None or vec2 is None:
+                print("Face.Normal - Error: The given vertices do not form a valid plane (all vertices might be collinear). Returning None.")
+                return None
+            
+            # Calculate the cross product of the two edge vectors
+            normal = np.cross(vec1, vec2)
 
-        # Normalize the normal vector
-        normal_length = np.linalg.norm(normal)
-        if normal_length == 0:
-            print("Face.Normal - Error: The given vertices do not form a valid plane (cross product resulted in a zero vector). Returning None.")
-            return None
-        
-        normal = normal / normal_length
-        normal = normal.tolist()
-        normal = [round(x, mantissa) for x in normal]
-        return_normal = []
-        outputType = list(outputType.lower())
-        for axis in outputType:
-            if axis == "x":
-                return_normal.append(normal[0])
-            elif axis == "y":
-                return_normal.append(normal[1])
-            elif axis == "z":
-                return_normal.append(normal[2])
+            # Normalize the normal vector
+            normal_length = np.linalg.norm(normal)
+            if normal_length == 0:
+                print("Face.Normal - Error: The given vertices do not form a valid plane (cross product resulted in a zero vector). Returning None.")
+                return None
+            
+            normal = normal / normal_length
+            normal = normal.tolist()
+            normal = [round(x, mantissa) for x in normal]
+            return_normal = []
+            outputType = list(outputType.lower())
+            for axis in outputType:
+                if axis == "x":
+                    return_normal.append(normal[0])
+                elif axis == "y":
+                    return_normal.append(normal[1])
+                elif axis == "z":
+                    return_normal.append(normal[2])
         return return_normal
     
     @staticmethod

topologicpy/Graph.py

@@ -158,7 +158,7 @@ class WorkerProcess(Process):
                     continue
                 if Vertex.Distance(source, destination) > self.tolerance:
                     edge = Edge.ByVertices([source, destination])
-                    e = Topology.Boolean(edge, face, operation="intersect")
+                    e = Topology.Intersect(edge, face)
                     if Topology.IsInstance(e, "Edge"):
                         edges.append(edge)
                 self.used[i + self.start_index][j] = 1

topologicpy/Topology.py

@@ -24,6 +24,9 @@ import math
 from collections import namedtuple
 from multiprocessing import Process, Queue
 
+# This is for View3D as not to open new browser windows
+opened_urls = set()
+
 try:
     import numpy as np
     from numpy import arctan, pi, signbit
@@ -968,18 +971,44 @@ class Topology():
         results = []
         if Topology.IsInstance(topologyA, "CellComplex"):
            cellsA = Topology.Cells(topologyA)
+        elif Topology.IsInstance(topologyA, "Cluster"):
+            cellsA = Cluster.FreeTopologies(topologyA)
         else:
             cellsA = [topologyA]
-        for cellA in cellsA:
-            if Topology.IsInstance(topologyB, "CellComplex"):
+        if Topology.IsInstance(topologyB, "CellComplex"):
                 cellsB = Topology.Cells(topologyB)
+        elif Topology.IsInstance(topologyB, "Cluster"):
+            cellsB = Cluster.FreeTopologies(topologyB)
+        else:
+            cellsB = [topologyB]
+        cellsA_2 = []
+        cellsB_2 = []
+        for cellA in cellsA:
+            if Topology.IsInstance(cellA, "CellComplex"):
+                cellsA_2 += Topology.Cells(cellA)
+            elif Topology.IsInstance(cellA, "Shell"):
+                cellsA_2 += Topology.Faces(cellA)
+            else:
+                cellsA_2.append(cellA)
+            
+        for cellB in cellsB:
+            if Topology.IsInstance(cellB, "CellComplex"):
+                cellsB_2 += Topology.Cells(cellB)
+            elif Topology.IsInstance(cellB, "Shell"):
+                cellsB_2 += Topology.Faces(cellB)
             else:
-                cellsB = [topologyB]
-            for cellB in cellsB:
+                cellsB_2.append(cellB)
+        
+        print("cellsA_2", cellsA_2)
+        print("cellsB_2", cellsB_2)
+        for cellA in cellsA_2:
+            for cellB in cellsB_2:
                 cellC = cellA.Intersect(cellB)
                 results.append(cellC)
-        results = [x for x in results if results is not None]
-        if len(results) == 1:
+        results = [x for x in results if x is not None]
+        if len(results) == 0:
+            return None
+        elif len(results) == 1:
             return results[0]
         else:
             return Topology.SelfMerge(Topology.SelfMerge(Cluster.ByTopologies(results)))
@@ -2443,7 +2472,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 +2496,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 +2673,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 +2693,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 +2742,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 +2763,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 +2794,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 +2819,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 +2861,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 +2887,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 +3035,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])
@@ -4672,7 +4715,7 @@ class Topology():
         return json_string
     
     @staticmethod
-    def OBJString(topology, color, vertexIndex, transposeAxes: bool = True, mode: int = 0, meshSize: float = None, mantissa: int = 6, tolerance: float = 0.0001):
+    def _OBJString(topology, color, vertexIndex, transposeAxes: bool = True, mode: int = 0, meshSize: float = None, mantissa: int = 6, tolerance: float = 0.0001):
         """
         Returns the Wavefront string of the input topology. This is very experimental and outputs a simple solid topology.
 
@@ -4743,6 +4786,7 @@ class Topology():
             finalLines = finalLines + "\n" + lines[i]
         return finalLines, len(vertices)
     
+
     @staticmethod
     def ExportToOBJ(*topologies, path, nameKey="name", colorKey="color", opacityKey="opacity", defaultColor=[256,256,256], defaultOpacity=0.5, transposeAxes: bool = True, mode: int = 0, meshSize: float = None, overwrite: bool = False, mantissa: int = 6, tolerance: float = 0.0001):
         """
@@ -4795,7 +4839,6 @@ class Topology():
 
         """
         from topologicpy.Helper import Helper
-        from topologicpy.Dictionary import Dictionary
         from os.path import exists
 
         if isinstance(topologies, tuple):
@@ -4806,7 +4849,7 @@ class Topology():
             print("Topology.ExportToOBJ - Error: the input topologies parameter does not contain any valid topologies. Returning None.")
             return None
         if not isinstance(new_topologies, list):
-            print("Dictionary.ByMergedDictionaries - Error: The input dictionaries parameter is not a valid list. Returning None.")
+            print("Topology.ExportToOBJ - Error: The input topologies parameter is not a valid list. Returning None.")
             return None
 
         if not overwrite and exists(path):
@@ -4820,39 +4863,126 @@ class Topology():
         status = False
        
         mtl_path = path[:-4] + ".mtl"
-       
+
+        obj_string, mtl_string = Topology.OBJString(new_topologies,
+                                                    nameKey=nameKey,
+                                                    colorKey=colorKey,
+                                                    opacityKey=opacityKey,
+                                                    defaultColor=defaultColor,
+                                                    defaultOpacity=defaultOpacity,
+                                                    transposeAxes=transposeAxes,
+                                                    mode=mode,
+                                                    meshSize=meshSize,
+                                                    mantissa=mantissa,
+                                                    tolerance=tolerance)
         # Write out the material file
-        n = max(len(str(len(topologies))), 3)
         with open(mtl_path, "w") as mtl_file:
-            for i in range(len(new_topologies)):
-                d = Topology.Dictionary(new_topologies[i])
-                name = Dictionary.ValueAtKey(d, nameKey) or "Untitled_"+str(i).zfill(n)
-                color = Dictionary.ValueAtKey(d, colorKey) or defaultColor
-                color = [c/255 for c in color]
-                opacity = Dictionary.ValueAtKey(d, opacityKey) or defaultOpacity
-                mtl_file.write("newmtl color_" + str(i).zfill(n) + "\n")
-                mtl_file.write("Kd " + ' '.join(map(str, color)) + "\n")
-                mtl_file.write("d " + str(opacity) + "\n")
-                
+            mtl_file.write(mtl_string)
         # Write out the obj file
         with open(path, "w") as obj_file:
-            vertex_index = 1  # global vertex index counter
-            obj_file.writelines("# topologicpy "+Helper.Version()+"\n")
-            obj_file.writelines("mtllib " + mtl_path.split('/')[-1])  # reference the MTL file
-            for i in range(len(topologies)):
-                d = Topology.Dictionary(topologies[i])
-                name = Dictionary.ValueAtKey(d, nameKey) or "Untitled_"+str(i).zfill(n)
-                name = name.replace(" ", "_")
-                obj_file.writelines("\ng "+name+"\n")
-                result = Topology.OBJString(topologies[i], "color_" + str(i).zfill(n), vertex_index, transposeAxes=transposeAxes, mode=mode,
-                                meshSize=meshSize,
-                                mantissa=mantissa, tolerance=tolerance)
-                
-                obj_file.writelines(result[0])
-                vertex_index += result[1]
-            obj_file.close()
-            status = True
-        return status
+            obj_file.write(obj_string)
+        return True
+
+    @staticmethod
+    def OBJString(*topologies, nameKey="name", colorKey="color", opacityKey="opacity", defaultColor=[256,256,256], defaultOpacity=0.5, transposeAxes: bool = True, mode: int = 0, meshSize: float = None, mantissa: int = 6, tolerance: float = 0.0001):
+        """
+        Exports the input topology to a Wavefront OBJ file. This is very experimental and outputs a simple solid topology.
+
+        Parameters
+        ----------
+        topologies : list or comma separated topologies
+            The input list of topologies.
+        path : str
+            The input file path.
+        nameKey : str , optional
+            The topology dictionary key under which to find the name of the topology. The default is "name".
+        colorKey : str, optional
+            The topology dictionary key under which to find the color of the topology. The default is "color".
+        opacityKey : str , optional
+            The topology dictionary key under which to find the opacity of the topology. The default is "opacity".
+        defaultColor : list , optional
+            The default color to use if no color is stored in the topology dictionary. The default is [255,255, 255] (white).
+        defaultOpacity : float , optional
+            The default opacity to use of no opacity is stored in the topology dictionary. This must be between 0 and 1. The default is 1 (fully opaque).
+        transposeAxes : bool , optional
+            If set to True the Z and Y coordinates are transposed so that Y points "up"
+        mode : int , optional
+            The desired mode of meshing algorithm (for triangulation). Several options are available:
+            0: Classic
+            1: MeshAdapt
+            3: Initial Mesh Only
+            5: Delaunay
+            6: Frontal-Delaunay
+            7: BAMG
+            8: Fontal-Delaunay for Quads
+            9: Packing of Parallelograms
+            All options other than 0 (Classic) use the gmsh library. See https://gmsh.info/doc/texinfo/gmsh.html#Mesh-options
+            WARNING: The options that use gmsh can be very time consuming and can create very heavy geometry.
+        meshSize : float , optional
+            The desired size of the mesh when using the "mesh" option. If set to None, it will be
+            calculated automatically and set to 10% of the overall size of the face.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+        overwrite : bool , optional
+            If set to True the ouptut file will overwrite any pre-existing file. Otherwise, it won't. The default is False.
+
+        Returns
+        -------
+        list
+            Return the OBJ and MTL strings as a list.
+
+        """
+        from topologicpy.Helper import Helper
+        from topologicpy.Dictionary import Dictionary
+        import io
+
+        obj_file = io.StringIO()
+        mtl_file = io.StringIO()
+
+        if isinstance(topologies, tuple):
+            topologies = Helper.Flatten(list(topologies))
+        if isinstance(topologies, list):
+            new_topologies = [d for d in topologies if Topology.IsInstance(d, "Topology")]
+        if len(new_topologies) == 0:
+            print("Topology.OBJString - Error: the input topologies parameter does not contain any valid topologies. Returning None.")
+            return None
+        if not isinstance(new_topologies, list):
+            print("Topology.OBJString - Error: The input dictionaries parameter is not a valid list. Returning None.")
+            return None
+       
+        # Write out the material file
+        n = max(len(str(len(topologies))), 3)
+        for i in range(len(new_topologies)):
+            d = Topology.Dictionary(new_topologies[i])
+            name = Dictionary.ValueAtKey(d, nameKey) or "Untitled_"+str(i).zfill(n)
+            color = Dictionary.ValueAtKey(d, colorKey) or defaultColor
+            color = [c/255 for c in color]
+            opacity = Dictionary.ValueAtKey(d, opacityKey) or defaultOpacity
+            mtl_file.write("newmtl color_" + str(i).zfill(n) + "\n")
+            mtl_file.write("Kd " + ' '.join(map(str, color)) + "\n")
+            mtl_file.write("d " + str(opacity) + "\n")
+        
+        vertex_index = 1  # global vertex index counter
+        obj_file.writelines("# topologicpy "+Helper.Version()+"\n")
+        obj_file.writelines("mtllib example.mtl")
+        for i in range(len(topologies)):
+            d = Topology.Dictionary(topologies[i])
+            name = Dictionary.ValueAtKey(d, nameKey) or "Untitled_"+str(i).zfill(n)
+            name = name.replace(" ", "_")
+            obj_file.writelines("\ng "+name+"\n")
+            result = Topology._OBJString(topologies[i], "color_" + str(i).zfill(n), vertex_index, transposeAxes=transposeAxes, mode=mode,
+                            meshSize=meshSize,
+                            mantissa=mantissa, tolerance=tolerance)
+            
+            obj_file.writelines(result[0])
+            vertex_index += result[1]
+        obj_string = obj_file.getvalue()
+        mtl_string = mtl_file.getvalue()
+        obj_file.close()
+        mtl_file.close()
+        return obj_string, mtl_string
 
     @staticmethod
     def Filter(topologies, topologyType="any", searchType="any", key=None, value=None):
@@ -7599,6 +7729,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 +7773,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
 
@@ -7984,4 +8119,105 @@ class Topology():
         predefined_namespace_dns = uuid.UUID('6ba7b810-9dad-11d1-80b4-00c04fd430c8')
         namespace_uuid = uuid.uuid5(predefined_namespace_dns, namespace)
         brep_string = Topology.BREPString(topology)
-        return uuid.uuid5(namespace_uuid, brep_string)
+        return uuid.uuid5(namespace_uuid, brep_string)
+    
+    @staticmethod
+    def View3D(*topologies, uuid = None, nameKey="name", colorKey="color", opacityKey="opacity", defaultColor=[256,256,256], defaultOpacity=0.5, transposeAxes: bool = True, mode: int = 0, meshSize: float = None, overwrite: bool = False, mantissa: int = 6, tolerance: float = 0.0001):
+        """
+        Sends the input topologies to 3dviewer.net. The topologies must be 3D meshes.
+
+        Parameters
+        ----------
+        topologies : list or comma separated topologies
+            The input list of topologies.
+        uuid : UUID , optional
+            The UUID v5 to use to identify these topologies. The default is a UUID based on the topologies themselves.
+        nameKey : str , optional
+            The topology dictionary key under which to find the name of the topology. The default is "name".
+        colorKey : str, optional
+            The topology dictionary key under which to find the color of the topology. The default is "color".
+        opacityKey : str , optional
+            The topology dictionary key under which to find the opacity of the topology. The default is "opacity".
+        defaultColor : list , optional
+            The default color to use if no color is stored in the topology dictionary. The default is [255,255, 255] (white).
+        defaultOpacity : float , optional
+            The default opacity to use of no opacity is stored in the topology dictionary. This must be between 0 and 1. The default is 1 (fully opaque).
+        transposeAxes : bool , optional
+            If set to True the Z and Y coordinates are transposed so that Y points "up"
+        mode : int , optional
+            The desired mode of meshing algorithm (for triangulation). Several options are available:
+            0: Classic
+            1: MeshAdapt
+            3: Initial Mesh Only
+            5: Delaunay
+            6: Frontal-Delaunay
+            7: BAMG
+            8: Fontal-Delaunay for Quads
+            9: Packing of Parallelograms
+            All options other than 0 (Classic) use the gmsh library. See https://gmsh.info/doc/texinfo/gmsh.html#Mesh-options
+            WARNING: The options that use gmsh can be very time consuming and can create very heavy geometry.
+        meshSize : float , optional
+            The desired size of the mesh when using the "mesh" option. If set to None, it will be
+            calculated automatically and set to 10% of the overall size of the face.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+        overwrite : bool , optional
+            If set to True the ouptut file will overwrite any pre-existing file. Otherwise, it won't. The default is False.
+
+        Returns
+        -------
+        bool
+            True if the export operation is successful. False otherwise.
+
+        """
+        from topologicpy.Helper import Helper
+        from topologicpy.Cluster import Cluster
+        import requests
+        import webbrowser
+
+        if isinstance(topologies, tuple):
+            topologies = Helper.Flatten(list(topologies))
+        if isinstance(topologies, list):
+            new_topologies = [d for d in topologies if Topology.IsInstance(d, "Topology")]
+        if len(new_topologies) == 0:
+            print("Topology.View3D - Error: the input topologies parameter does not contain any valid topologies. Returning None.")
+            return None
+        if not isinstance(new_topologies, list):
+            print("Topology.View3D - Error: The input topologies parameter is not a valid list. Returning None.")
+            return None
+
+        if uuid == None:
+            cluster = Cluster.ByTopologies(new_topologies)
+            uuid = Topology.UUID(cluster)
+        obj_string, mtl_string = Topology.OBJString(new_topologies,
+                                                    nameKey=nameKey,
+                                                    colorKey=colorKey,
+                                                    opacityKey=opacityKey,
+                                                    defaultColor=defaultColor,
+                                                    defaultOpacity=defaultOpacity,
+                                                    transposeAxes=transposeAxes,
+                                                    mode=mode,
+                                                    meshSize=meshSize,
+                                                    mantissa=mantissa,
+                                                    tolerance=tolerance)
+        
+
+        file_contents = {}
+        file_contents['example.obj'] = obj_string
+        file_contents['example.mtl'] = mtl_string
+
+        try:
+            response = requests.post('https://3dviewer.deno.dev/upload/'+str(uuid), files=file_contents)
+            if response.status_code != 200:
+                print(f'Failed to upload file(s): {response.status_code} {response.reason}')
+            # Open the web page in the default web browser
+            # URL of the web page you want to open
+            url = "https://3dviewer.deno.dev/#channel="+str(uuid)
+            if not url in opened_urls:
+                opened_urls.add(url)
+                webbrowser.open(url)
+        except requests.exceptions.RequestException as e:
+            print(f'Error uploading file(s): {e}')
+        return True

topologicpy/Vector.py

@@ -77,6 +77,12 @@ class Vector(list):
             The angle in degrees between the two input vectors.
 
         """
+        if vectorA == None:
+            print("Vector.Angle - Error: The input vectorA is None. Returning None.")
+            return None
+        if vectorB == None:
+            print("Vector.Angle - Error: The input vectorB is None. Returning None.")
+            return None
         n_v1=la.norm(vectorA)
         n_v2=la.norm(vectorB)
         if n_v1 == 0 or n_v2 == 0:

topologicpy/version.py

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

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

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

@@ -1,16 +1,16 @@
-topologicpy/ANN.py,sha256=CLK6kPV28ag-hc60pyqoXt4GPiYQDUL8N48tjAbZ9Do,48981
+topologicpy/ANN.py,sha256=A7k3RZ6rVccLLzJhQMz_5xaDUnLJDgJMQTtnG_Bsc-s,49166
 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/Edge.py,sha256=QHXb0R9bdPHfHhi64rXrCeeFoLv8iaMeBxqvocBm1XI,58327
+topologicpy/Dictionary.py,sha256=4VtIT1p4UHWButzRUnajj16V0DY-d5RaENbXLNTbCYU,27097
+topologicpy/Edge.py,sha256=H5UVhdQ9hjBdipx0AL6U8XQXula_1pBajFB_JI_LIak,58409
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
-topologicpy/Face.py,sha256=XS2ODccQRQvIdeuKAydjyAJmNqkwm8-RJJ5M1l4gt68,109523
-topologicpy/Graph.py,sha256=eKGKgfXFeTHOuKUTVfCjuRcHZLElE-nNNWhaJ2eZ4LM,391684
+topologicpy/Face.py,sha256=gJNOzaTBxMcd71A-FAzQ3sQFKbsL35cpkGzgtNu6tmo,110131
+topologicpy/Graph.py,sha256=rYUhw7XP6LVogbIZfAsrYEZoilN1BabloZHdcWskrMo,391663
 topologicpy/Grid.py,sha256=Q-2WNBkvIsJks7pbGkzzkRWVB4fTMYgWipG3lcDXbpE,18496
 topologicpy/Helper.py,sha256=mLwJmhyc-d-JqW82MBf7JwM91zWHVx8RzOmndPWHm-k,17717
 topologicpy/Honeybee.py,sha256=vcBECJlgWVjNNdD9ZmjNik_pA1Y_ZNoOorsQb2CiyGA,21965
@@ -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/Vector.py,sha256=JAIeOZplh7sQD46K4eP3gMgvK6iB1wwpZ0sC9-FFGq8,32803
+topologicpy/Topology.py,sha256=PkuCetAUADmEuu17-R19ACoub7iZijA8S_v3t0YLL3s,361467
+topologicpy/Vector.py,sha256=WQQUbwrg7VKImtxuBUi2i-FRiPT77WlrzLP05gdXKM8,33079
 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=mExVIZTppRZKivnNYLkY3fXqANuLsLtYbD1gMqdgaXM,23
+topologicpy-0.7.26.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.26.dist-info/METADATA,sha256=s84QUjxqFTjnzTZGzBs-L1GzOLxH63nzrUVVx7DrC2I,10916
+topologicpy-0.7.26.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+topologicpy-0.7.26.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.26.dist-info/RECORD,,

{topologicpy-0.7.23.dist-info → topologicpy-0.7.26.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