topologicpy 0.7.65__py3-none-any.whl → 0.7.67__py3-none-any.whl

topologicpy/Plotly.py

@@ -932,6 +932,8 @@ class Plotly:
         data = []
         v_list = []
         
+        if not isinstance(colorScale, str):
+            colorScale = "viridis"
         if Topology.Type(topology) == Topology.TypeID("Vertex"):
             tp_vertices = [topology]
         else:

topologicpy/Shell.py

@@ -1520,7 +1520,7 @@ class Shell():
         origin = Topology.Centroid(face)
         normal = Face.Normal(face, mantissa=mantissa)
         flat_face = Topology.Flatten(face, origin=origin, direction=normal)
-        roof = Wire.Roof(flat_face, angle=angle, tolerance=tolerance)
+        roof = Wire.Roof(flat_face, angle=angle, boundary=True, tolerance=tolerance)
         if not roof:
             return None
         shell = Shell.Skeleton(flat_face, tolerance=tolerance)

topologicpy/Topology.py

@@ -245,7 +245,7 @@ class Topology():
         
         for aperture in apertures:
             d = Topology.Dictionary(aperture)
-            d = Dictionary.SetValueAtKey(d, "type", "aperture")
+            d = Dictionary.SetValueAtKey(d, "type", "Aperture")
             aperture = Topology.SetDictionary(aperture, d)
         
         topology = Topology.AddContent(topology, apertures, subTopologyType=subTopologyType, tolerance=tolerance)
@@ -864,7 +864,7 @@ class Topology():
                 d = Topology.Dictionary(content)
                 if len(Dictionary.Keys(d)) > 0:
                     type = Dictionary.ValueAtKey(d,"type")
-                    if type == "aperture":
+                    if "aperture" in type.lower():
                         apertures.append(content)
         elif subTopologyType.lower() == "vertex":
             subTopologies = Topology.Vertices(topology)
@@ -3033,16 +3033,14 @@ class Topology():
         Returns
         -------
         list
-            The list of imported topologies.
+            The list of imported topologies (Warning: the list could contain 0, 1, or many topologies, but this method will always return a list)
 
         """
         if not file:
             print("Topology.ByJSONFile - Error: the input file parameter is not a valid file. Returning None.")
             return None
-        json_string = json.load(file)
-        #jsonData = json.load(file)
-        #jsonString = json.dumps(jsonData)
-        return Topology.ByJSONString(json_string, tolerance=tolerance)
+        json_dict = json.load(file)
+        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
     
     @staticmethod
     def ByJSONPath(path, tolerance=0.0001):
@@ -3067,26 +3065,26 @@ class Topology():
             print("Topology.ByJSONPath - Error: the input path parameter is not a valid path. Returning None.")
             return None
         with open(path) as file:
-            json_string = json.load(file)
-        entities = Topology.ByJSONString(json_string, tolerance=tolerance)
+            json_dict = json.load(file)
+        entities = Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
         return entities
     
     @staticmethod
-    def ByJSONString(string, tolerance=0.0001):
+    def ByJSONDictionary(jsonDictionary, tolerance=0.0001):
         """
-        Imports the topology from a JSON string.
+        Imports the topology from a JSON dictionary.
 
         Parameters
         ----------
-        string : str
-            The input JSON string.
+        jsonDictionary : dict
+            The input JSON dictionary.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
         Returns
         -------
-        list or topologicpy.Topology
-            The list of imported topologies. If the list only contains one element, it returns that element.
+        list
+            The list of imported topologies (Warning: the list could contain 0, 1, or many topologies, but this method will always return a list)
 
         """
         from topologicpy.Vertex import Vertex
@@ -3110,9 +3108,7 @@ class Topology():
         vertex_apertures = []
         edge_apertures = []
         face_apertures = []
-        # Step 2: Create Entities and handle apertures
-        json_dictionary = json.loads(string)
-        for entity in json_dictionary:
+        for entity in jsonDictionary:
             entity_type = entity['type']
             entity_dict = Dictionary.ByKeysValues(keys=list(entity['dictionary'].keys()),
                                                 values=list(entity['dictionary'].values()))
@@ -3280,6 +3276,28 @@ class Topology():
                     entity = Topology.AddApertures(entity, vertex_apertures, subTopologyType="Vertex", tolerance=0.001)
                 top_level_list.append(entity)
         return top_level_list
+    
+    @staticmethod
+    def ByJSONString(string, tolerance=0.0001):
+        """
+        Imports the topology from a JSON string.
+
+        Parameters
+        ----------
+        string : str
+            The input JSON string.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+
+        Returns
+        -------
+        list
+            The list of imported topologies (Warning: the list could contain 0, 1, or many topologies, but this method will always return a list)
+
+        """
+
+        json_dict = json.loads(string)
+        return Topology.ByJSONDictionary(json_dict, tolerance=tolerance)
 
     @staticmethod
     def ByOBJFile(objFile, mtlFile = None,

topologicpy/Wire.py

@@ -2910,7 +2910,7 @@ class Wire():
         return return_wire
 
     @staticmethod
-    def Roof(face, angle: float = 45, tolerance: float = 0.001):
+    def Roof(face, angle: float = 45, boundary: bool = True, tolerance: float = 0.001):
         """
             Creates a hipped roof through a straight skeleton. This method is contributed by 高熙鹏 xipeng gao <gaoxipeng1998@gmail.com>
             This algorithm depends on the polyskel code which is included in the library. Polyskel code is found at: https://github.com/Botffy/polyskel
@@ -2921,6 +2921,8 @@ class Wire():
             The input face.
         angle : float , optioal
             The desired angle in degrees of the roof. The default is 45.
+        boundary : bool , optional
+            If set to True the original boundary is returned as part of the roof. Otherwise it is not. The default is True.
         tolerance : float , optional
             The desired tolerance. The default is 0.001. (This is set to a larger number as it was found to work better)
 
@@ -2977,7 +2979,7 @@ class Wire():
                         edges.append(e)
             return edges
         
-        def face_to_skeleton(face, angle=0):
+        def face_to_skeleton(face, angle=0, boundary=True):
             normal = Face.Normal(face)
             eb_wire = Face.ExternalBoundary(face)
             ib_wires = Face.InternalBoundaries(face)
@@ -3003,7 +3005,10 @@ class Wire():
                 return None
             slope = math.tan(math.radians(angle))
             roofEdges = subtrees_to_edges(skeleton, zero_coordinates, slope)
-            roofEdges = Helper.Flatten(roofEdges)+Topology.Edges(face)
+            if boundary == True:
+                roofEdges = Helper.Flatten(roofEdges)+Topology.Edges(face)
+            else:
+                roofEdges = Helper.Flatten(roofEdges)
             roofTopology = Topology.SelfMerge(Cluster.ByTopologies(roofEdges), tolerance=tolerance)
             return roofTopology
         
@@ -3016,7 +3021,7 @@ class Wire():
         normal = Face.Normal(face)
         flat_face = Topology.Flatten(face, origin=origin, direction=normal)
         d = Topology.Dictionary(flat_face)
-        roof = face_to_skeleton(flat_face, angle)
+        roof = face_to_skeleton(flat_face, angle=angle, boundary=boundary)
         if not roof:
             return None
         roof = Topology.Unflatten(roof, origin=origin, direction=normal)
@@ -3114,7 +3119,7 @@ class Wire():
         return new_wire
 
     @staticmethod
-    def Skeleton(face, tolerance=0.001):
+    def Skeleton(face, boundary: bool = True, tolerance: float = 0.001):
         """
         Creates a straight skeleton. This method is contributed by 高熙鹏 xipeng gao <gaoxipeng1998@gmail.com>
         This algorithm depends on the polyskel code which is included in the library. Polyskel code is found at: https://github.com/Botffy/polyskel
@@ -3123,6 +3128,8 @@ class Wire():
         ----------
         face : topologic_core.Face
             The input face.
+        boundary : bool , optional
+            If set to True the original boundary is returned as part of the roof. Otherwise it is not. The default is True.
         tolerance : float , optional
             The desired tolerance. The default is 0.001. (This is set to a larger number as it was found to work better)
 
@@ -3134,7 +3141,7 @@ class Wire():
         """
         if not Topology.IsInstance(face, "Face"):
             return None
-        return Wire.Roof(face, angle=0, tolerance=tolerance)
+        return Wire.Roof(face, angle=0, boundary=boundary, tolerance=tolerance)
     
     @staticmethod
     def Spiral(origin = None, radiusA : float = 0.05, radiusB : float = 0.5, height : float = 1, turns : int = 10, sides : int = 36, clockwise : bool = False, reverse : bool = False, direction: list = [0, 0, 1], placement: str = "center", tolerance: float = 0.0001):

topologicpy/__init__.py

@@ -20,3 +20,6 @@ from sys import platform
 from .version import __version__
 
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
+
+# Set an alias for ease of access
+version = __version__

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.65'
+__version__ = '0.7.67'

{topologicpy-0.7.65.dist-info → topologicpy-0.7.67.dist-info}/METADATA

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

@@ -10,27 +10,27 @@ topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=cURg452wwk2WeSxWY46ncgAUo5XD1c2c5EtO6ESZHaY,27304
 topologicpy/Edge.py,sha256=FACD8Bm2nL2uTHIeRMVXfRF0cYeqhZ-lCZPHAfjAIPg,66927
 topologicpy/EnergyModel.py,sha256=NM3_nAdY9_YDtbp9CaEZ0x0xVsetTqVDzm_VSjmq_mI,53746
-topologicpy/Face.py,sha256=emRTWbaLZeU3E0MprqpltTxC4ckv42h36enOcUMcLpU,124144
-topologicpy/Graph.py,sha256=4b8bzlyXmh0Ef9rjiEjl8wmh_9vAxoE5xiSiGvGjG9Q,411392
+topologicpy/Face.py,sha256=lCjahpvNpaI-yNm_VN1-4HxjPEkpPIbRnyyj7H6DsPc,124354
+topologicpy/Graph.py,sha256=IZrWxXnA--e0fmMjkdyj7Xxj945zT4gVMK-Nyieas8o,382597
 topologicpy/Grid.py,sha256=3-sn7CHWGcXk18XCnHjsUttNJTWwmN63g_Insj__p04,18218
 topologicpy/Helper.py,sha256=i-AfI29NMsZXBaymjilfvxQbuS3wpYbpPw4RWu1YCHs,16358
 topologicpy/Honeybee.py,sha256=Oc8mfGBNSjs6wxkPzCKmEw1ZPQPbp9XtiYWaAF62oSk,21893
 topologicpy/Matrix.py,sha256=umgR7An919-wGInXJ1wpqnoQ2jCPdyMe2rcWTZ16upk,8079
 topologicpy/Neo4j.py,sha256=t52hgE9cVsqkGc7m7fjRsLnyfRHakVHwdvF4ms7ow78,22342
-topologicpy/Plotly.py,sha256=k-gluqX4Na3zlYCDl_6A0gqeFoGR-0Oy6fLiT-Zqlyk,108362
+topologicpy/Plotly.py,sha256=P6wQ2W9Urm5Rrx5_Bh8hwiFDSFQYzN_hJDUj-y3BO0c,108441
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 topologicpy/PyG.py,sha256=LU9LCCzjxGPUM31qbaJXZsTvniTtgugxJY7y612t4A4,109757
-topologicpy/Shell.py,sha256=joahFtpRQTWJpQOmi3qU4Xe0Sx2XXeayHlXTNx8CzMk,87610
+topologicpy/Shell.py,sha256=iX9jLbpylRqt24jtzEH6kSWvA5JvbhAY_w880PxJXP8,87625
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=42tDWMYpwRG7Z2Qjtp94eRgBuqySq7k8TgNUZDK7QxQ,36837
-topologicpy/Topology.py,sha256=DsRPV0iWUY2NIlxdvLLDBkkDY3xw8oYvmzQEEfJUusQ,398136
+topologicpy/Topology.py,sha256=7HUdFQZ2V-xRHLXzRXaN7pEZHWAv6yv7Zn7ou642mYY,398747
 topologicpy/Vector.py,sha256=A1g83zDHep58iVPY8WQ8iHNrSOfGWFEzvVeDuMnjDNY,33078
 topologicpy/Vertex.py,sha256=bLY60YWoMsgCgHk7F7k9F93Sq2FJ6AzUcTfJ83NZfHA,71107
-topologicpy/Wire.py,sha256=68KGFO6jere1aj5lci0W67kDRThXLMko8oY68q-ZP_A,171939
-topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=4-LUGtsfz8i419m9JYP1wXtHIMULgrganMwzGAvPIkU,23
-topologicpy-0.7.65.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
-topologicpy-0.7.65.dist-info/METADATA,sha256=BzRukyNwXpaXv7OWSodC4FUsGbC5LMvLaGsAj10xvV8,10493
-topologicpy-0.7.65.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-topologicpy-0.7.65.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.65.dist-info/RECORD,,
+topologicpy/Wire.py,sha256=BIWv-NIDd31F1EMdX20rHGr_QPhut7SNyqkZmHpv93Q,172480
+topologicpy/__init__.py,sha256=vlPCanUbxe5NifC4pHcnhSzkmmYcs_UrZrTlVMsxcFs,928
+topologicpy/version.py,sha256=lLx7SH29wIbpawsGm3Hr19wrLnvr39XEY2lKATjP0-M,23
+topologicpy-0.7.67.dist-info/LICENSE,sha256=FK0vJ73LuE8PYJAn7LutsReWR47-Ooovw2dnRe5yV6Q,681
+topologicpy-0.7.67.dist-info/METADATA,sha256=UWDuYpsLxboxLOcBpAoqXCaFS0vR2cHrgBnD_ywyCys,10493
+topologicpy-0.7.67.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+topologicpy-0.7.67.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.67.dist-info/RECORD,,

{topologicpy-0.7.65.dist-info → topologicpy-0.7.67.dist-info}/WHEEL

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