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

topologicpy/Edge.py

@@ -293,7 +293,8 @@ class Edge():
         import inspect
 
         if len(args) == 0:
-            print("Edge.ByVertices - Error: The input vertices parameter is an empty list. Returning None.")
+            if not silent:
+                print("Edge.ByVertices - Error: The input vertices parameter is an empty list. Returning None.")
             return None
         if len(args) == 1:
             vertices = args[0]
@@ -1107,7 +1108,7 @@ class Edge():
         return Edge.Direction(normal_edge)
 
     @staticmethod
-    def NormalEdge(edge, length: float = 1.0, u: float = 0.5, angle: float = 0.0):
+    def NormalEdge(edge, length: float = 1.0, u: float = 0.5, angle: float = 0.0, tolerance: float = 0.0001, silent: bool = False):
         """
         Returns the normal (perpendicular) vector to the input edge as an edge.
 
@@ -1125,7 +1126,11 @@ class Edge():
         angle : float , optional
             The desired rotational offset angle in degrees for the normal edge. This rotates the normal edge
             by the angle value around the axis defined by the input edge. The default is 0.0.
-
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+        
         Returns
         -------
         topologic_core.Edge
@@ -1153,8 +1158,13 @@ class Edge():
                 # Otherwise, calculate the normal by crossing with the Z-axis
                 z_axis = np.array([0, 0, 1])
                 normal_vector = np.cross(direction_vector, z_axis)
+
+            # Check if the normal vector is effectively zero before normalization
+            if np.isclose(norm(normal_vector), 0):
+                return normal_vector
             
-            normal_vector /= norm(normal_vector)  # Normalize the normal vector
+            # Normalize the normal vector
+            normal_vector /= norm(normal_vector)  
             return normal_vector
 
         def calculate_normal_line(start_vertex, end_vertex):
@@ -1168,10 +1178,12 @@ class Edge():
             return start_vertex, normal_end_vertex
 
         if not Topology.IsInstance(edge, "Edge"):
-            print("Edge.NormalEdge - Error: The input edge parameter is not a valid edge. Returning None.")
+            if not silent:
+                print("Edge.NormalEdge - Error: The input edge parameter is not a valid edge. Returning None.")
             return None
         if length <= 0.0:
-            print("Edge.NormalEdge - Error: The input length parameter is not a positive number greater than zero. Returning None.")
+            if not silent:
+                print("Edge.NormalEdge - Error: The input length parameter is not a positive number greater than zero. Returning None.")
             return None
 
         # Get start and end vertex coordinates
@@ -1186,10 +1198,13 @@ class Edge():
         ev = Vertex.ByCoordinates(list(normal_line_end))
         
         # Create an edge from the start to the end of the normal vector
-        normal_edge = Edge.ByVertices([sv, ev])
-
+        normal_edge = Edge.ByVertices([sv, ev], tolerance=tolerance, silent=silent)
+        if normal_edge == None:
+            if not silent:
+                print("Edge.NormalEdge - Error: Could not create edge. Returning None.")
+            return None
         # Set the length of the normal edge
-        normal_edge = Edge.SetLength(normal_edge, length, bothSides=False)
+        normal_edge = Edge.SetLength(normal_edge, length, bothSides=False, tolerance=tolerance)
 
         # Rotate the normal edge around the input edge by the specified angle
         edge_direction = Edge.Direction(edge)

topologicpy/Graph.py

@@ -8119,7 +8119,8 @@ class Graph:
              camera=[-1.25, -1.25, 1.25],
              center=[0, 0, 0], up=[0, 0, 1],
              projection="perspective",
-             tolerance=0.0001):
+             tolerance=0.0001,
+             silent=False):
         """
         Shows the graph using Plotly.
 
@@ -8218,9 +8219,10 @@ class Graph:
             The desired up vector. The default is [0, 0, 1].
         projection : str , optional
             The desired type of projection. The options are "orthographic" or "perspective". It is case insensitive. The default is "perspective"
-
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
         
         Returns
         -------
@@ -8234,7 +8236,7 @@ class Graph:
             print("Graph.Show - Error: The input graph is not a valid graph. Returning None.")
             return None
         
-        data= Plotly.DataByGraph(graph, sagitta=sagitta, absolute=absolute, sides=sides, vertexColor=vertexColor, vertexSize=vertexSize, vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, vertexGroups=vertexGroups, showVertices=showVertices, showVertexLabels=showVertexLabels, showVertexLegend=showVertexLegend, edgeColor=edgeColor, edgeWidth=edgeWidth, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, edgeGroups=edgeGroups, showEdges=showEdges, showEdgeLabels=showEdgeLabels, showEdgeLegend=showEdgeLegend, colorScale=colorScale)
+        data= Plotly.DataByGraph(graph, sagitta=sagitta, absolute=absolute, sides=sides, vertexColor=vertexColor, vertexSize=vertexSize, vertexLabelKey=vertexLabelKey, vertexGroupKey=vertexGroupKey, vertexGroups=vertexGroups, showVertices=showVertices, showVertexLabels=showVertexLabels, showVertexLegend=showVertexLegend, edgeColor=edgeColor, edgeWidth=edgeWidth, edgeLabelKey=edgeLabelKey, edgeGroupKey=edgeGroupKey, edgeGroups=edgeGroups, showEdges=showEdges, showEdgeLabels=showEdgeLabels, showEdgeLegend=showEdgeLegend, colorScale=colorScale, silent=silent)
         fig = Plotly.FigureByData(data, width=width, height=height, xAxis=xAxis, yAxis=yAxis, zAxis=zAxis, axisSize=axisSize, backgroundColor=backgroundColor,
                                   marginLeft=marginLeft, marginRight=marginRight, marginTop=marginTop, marginBottom=marginBottom, tolerance=tolerance)
         Plotly.Show(fig, renderer=renderer, camera=camera, center=center, up=up, projection=projection)

topologicpy/Plotly.py

@@ -293,7 +293,8 @@ class Plotly:
                     showEdgeLabels: bool = False,
                     showEdgeLegend: bool = False,
                     colorScale: str = "viridis",
-                    mantissa: int = 6):
+                    mantissa: int = 6,
+                    silent: bool = False):
         """
         Creates plotly vertex and edge data from the input graph.
 
@@ -354,6 +355,9 @@ class Plotly:
             If set to True the edge legend will be drawn. Otherwise, it will not be drawn. The default is False.
         colorScale : str , optional
             The desired type of plotly color scales to use (e.g. "Viridis", "Plasma"). The default is "Viridis". For a full list of names, see https://plotly.com/python/builtin-colorscales/.
+        silent : bool , optional
+            If set to True, no error and warning messages are printed. Otherwise, they are. The default is False.
+        
         Returns
         -------
         list
@@ -446,11 +450,11 @@ class Plotly:
             if sagitta > 0:
                 for edge in edges:
                     d = Topology.Dictionary(edge)
-                    arc = Wire.ArcByEdge(edge, sagitta=sagitta, absolute=absolute, sides=sides, close=False)
+                    arc = Wire.ArcByEdge(edge, sagitta=sagitta, absolute=absolute, sides=sides, close=False, silent=silent)
                     if Topology.IsInstance(arc, "Wire"):
                         arc_edges = Topology.Edges(arc)
                         for arc_edge in arc_edges:
-                            arc_edge = Topology.SetDictionary(arc_edge, d)
+                            arc_edge = Topology.SetDictionary(arc_edge, d, silent=silent)
                             new_edges.append(arc_edge)
                     else:
                         new_edges.append(edge)

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

@@ -206,7 +206,11 @@ class Wire():
             length = sagitta
         else:
             length = Edge.Length(edge)*sagitta
-        norm = Edge.NormalEdge(edge, length=length)
+        norm = Edge.NormalEdge(edge, length=length, silent=silent)
+        if norm == None:
+            if not silent:
+                print("Wire.ArcByEdge - Warning: Could not create an arc. Returning the original edge.")
+            return edge
         cv = Edge.EndVertex(norm)
         return Wire.Arc(sv, cv, ev, sides=sides, close=close)
     

topologicpy/version.py

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

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

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

@@ -8,29 +8,29 @@ topologicpy/Color.py,sha256=FrxX2yILqWvYrqD8kBaknfMfOR_phJOmhvTvFc07bY4,18065
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=Dd6O08D-vSxpjHYgKm45JpKiaeGvWlg1BRMzYMAXGNc,138991
 topologicpy/Dictionary.py,sha256=cURg452wwk2WeSxWY46ncgAUo5XD1c2c5EtO6ESZHaY,27304
-topologicpy/Edge.py,sha256=7Mxu9w9AY8uEk-xJpwMlWkuAgK96YIvUo0jtS5xuPq0,66123
+topologicpy/Edge.py,sha256=FACD8Bm2nL2uTHIeRMVXfRF0cYeqhZ-lCZPHAfjAIPg,66927
 topologicpy/EnergyModel.py,sha256=NM3_nAdY9_YDtbp9CaEZ0x0xVsetTqVDzm_VSjmq_mI,53746
 topologicpy/Face.py,sha256=YjU6TxxW2Mf5InumMvzXUXVVRdtjxyRGauRIhGXzkao,116411
-topologicpy/Graph.py,sha256=NoHGYCCoCFP2nDLrzkM7x4hpemo6KiVeOq5Cm0BR78c,411204
+topologicpy/Graph.py,sha256=4b8bzlyXmh0Ef9rjiEjl8wmh_9vAxoE5xiSiGvGjG9Q,411392
 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=BezQ-sdpU8B0W4X_kaF7alZrlN0-h4779HFrB3Fsn-w,22033
-topologicpy/Plotly.py,sha256=FeRneK3QfMdWZzwnr2lLWvFLQIjwuyq9ms-DghvuZnI,108134
+topologicpy/Plotly.py,sha256=k-gluqX4Na3zlYCDl_6A0gqeFoGR-0Oy6fLiT-Zqlyk,108362
 topologicpy/Polyskel.py,sha256=EFsuh2EwQJGPLiFUjvtXmAwdX-A4r_DxP5hF7Qd3PaU,19829
 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/Wire.py,sha256=nRD_TqDpgbdQ1-YrMqrxVq_sYwi91Ad83mflFGL4Na4,162578
 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=zE7Ne5ringVmSmv9eQ1aDQ5rppXqGLcX_FCGFkD0JoU,23
+topologicpy-0.7.62.dist-info/LICENSE,sha256=BRNw73R2WdDBICtwhI3wm3cxsaVqLTAGuRwrTltcfxs,1068
+topologicpy-0.7.62.dist-info/METADATA,sha256=awRKe419hWCdlGWl5t1Yrt-Hkm4E6BYxSJFzvcYKpSE,10918
+topologicpy-0.7.62.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+topologicpy-0.7.62.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.62.dist-info/RECORD,,