topologicpy 0.5.6__tar.gz → 0.5.8__tar.gz

{topologicpy-0.5.6/src/topologicpy.egg-info → topologicpy-0.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.5.6
+Version: 0.5.8
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 Project-URL: Homepage, https://github.com/wassimj/TopologicPy

{topologicpy-0.5.6 → topologicpy-0.5.8}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=61"]
 build-backend = "setuptools.build_meta"
 [project]
 name = "topologicpy"
-version = "0.5.6"
+version = "0.5.8"
 authors = [
   { name="Wassim Jabi", email="wassim.jabi@gmail.com" },
 ]

{topologicpy-0.5.6 → topologicpy-0.5.8}/src/topologicpy/Dictionary.py

@@ -415,6 +415,57 @@ class Dictionary(topologic.Dictionary):
                 pythonDict[key]=("")
         return pythonDict
 
+    @staticmethod
+    def RemoveKey(dictionary, key):
+        """
+        Removes the key (and its associated value) from the input dictionary.
+
+        Parameters
+        ----------
+        dictionary : topologic.Dictionary or dict
+            The input dictionary.
+        key : string
+            The input key.
+
+        Returns
+        -------
+        topologic.Dictionary or dict
+            The input dictionary with the key/value removed from it.
+
+        """
+        def processPythonDictionary (dictionary, key):
+            values = []
+            keys = dictionary.keys()
+            new_dict = {}
+            for k in keys:
+                if not key.lower() == k.lower():
+                    new_dict[key] = dictionary[key]
+            return new_dict
+
+        def processTopologicDictionary(dictionary, key):
+            keys = dictionary.Keys()
+            new_keys = []
+            new_values = []
+            for k in keys:
+                if not key.lower() == k.lower():
+                    new_keys.append(k)
+                    new_values.append(Dictionary.ValueAtKey(dictionary, k))
+            return Dictionary.ByKeysValues(new_keys, new_values)
+        
+        if not isinstance(dictionary, topologic.Dictionary) and not isinstance(dictionary, dict):
+            print("Dictionary.RemoveKey - Error: The input dictionary parameter is not a valid topologic or python dictionary. Returning None.")
+            return None
+        if not isinstance(key, str):
+            print("Dictionary.RemoveKey - Error: The input key parameter is not a valid string. Returning None.")
+            return None
+
+        if isinstance(dictionary, dict):
+            return processPythonDictionary(dictionary, key)
+        elif isinstance(dictionary, topologic.Dictionary):
+            return processTopologicDictionary(dictionary, key)
+        else:
+            return None
+        
     @staticmethod
     def SetValueAtKey(dictionary, key, value):
         """

{topologicpy-0.5.6 → topologicpy-0.5.8}/src/topologicpy/Face.py

@@ -1786,7 +1786,7 @@ class Face(Topology):
         return Face.ByWire(wire, tolerance=tolerance)
 
     @staticmethod
-    def Triangulate(face:topologic.Face, mode: str = "classic", meshSize: float = None, tolerance: float = 0.0001) -> list:
+    def Triangulate(face:topologic.Face, mode: int = 0, meshSize: float = None, tolerance: float = 0.0001) -> list:
         """
         Triangulates the input face and returns a list of faces.
 
@@ -1796,10 +1796,18 @@ class Face(Topology):
             The input face.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
-        mode : str , optional
-            The desired mode of meshing. Two options are available: "classic" and "mesh". They are case insensitive.
-            The "mesh" option uses the gmsh library.
-            WARNING: The "mesh" option can be very time consuming and can create very heavy geometry.
+        mode : int , optional
+            The desired mode of meshing algorithm. 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.
@@ -1810,14 +1818,11 @@ class Face(Topology):
             The list of triangles of the input face.
 
         """
-        from topologicpy.Vertex import Vertex
         from topologicpy.Wire import Wire
-        from topologicpy.Shell import Shell
         from topologicpy.Topology import Topology
-        from topologicpy.Dictionary import Dictionary
 
         # This function was contributed by Yidan Xue.
-        def generate_gmsh(face, meshSize = None, tolerance = 0.0001):
+        def generate_gmsh(face, mode="mesh", meshSize = None, tolerance = 0.0001):
             """
             Creates a gmsh of triangular meshes from the input face.
 
@@ -1921,7 +1926,9 @@ class Face(Topology):
 
             gmsh.model.geo.addPlaneSurface([i+1 for i in range(current_wire_number)])
             gmsh.model.geo.synchronize()
-            
+            if mode not in [1,3,5,6,7,8,9]:
+                mode = 6
+            gmsh.option.setNumber("Mesh.Algorithm", mode)
             gmsh.model.mesh.generate(2)         # For a 2D mesh
             nodeTags, nodeCoords, nodeParams = gmsh.model.mesh.getNodes(-1, -1)
             elemTypes, elemTags, elemNodeTags = gmsh.model.mesh.getElements(-1, -1)
@@ -1955,9 +1962,7 @@ class Face(Topology):
         normal = Face.Normal(face)
         flatFace = Topology.Flatten(face, origin=origin, direction=normal)
 
-        if "mesh" in mode.lower():
-            shell_faces = generate_gmsh(flatFace, meshSize = meshSize, tolerance = tolerance)
-        else:
+        if mode == 0:
             shell_faces = []
             for i in range(0,5,1):
                 try:
@@ -1965,7 +1970,9 @@ class Face(Topology):
                     break
                 except:
                     continue
-        
+        else:
+            shell_faces = generate_gmsh(flatFace, mode = mode, meshSize = meshSize, tolerance = tolerance)
+            
         if len(shell_faces) < 1:
             return []
         finalFaces = []