topologicpy 0.7.2__py3-none-any.whl → 0.7.4__py3-none-any.whl

topologicpy/Edge.py

@@ -635,25 +635,45 @@ class Edge():
         if Edge.Length(edgeB) < tolerance:
             print("Edge.IsCollinear - Error: The length of edgeB is less than the tolerance. Returning None")
             return None
-        # Calculate coefficients A, B, C from edgeA
+        
+        # Get start and end points of the first edge
         start_a = Edge.StartVertex(edgeA)
         end_a = Edge.EndVertex(edgeA)
-        A = Vertex.Y(end_a, mantissa=mantissa) - Vertex.Y(start_a, mantissa=mantissa)
-        B = -(Vertex.X(end_a, mantissa=mantissa) - Vertex.X(start_a, mantissa=mantissa))
-        norm = np.sqrt(A ** 2 + B ** 2)
-        A /= norm
-        B /= norm
-        C = -(A * Vertex.X(start_a, mantissa=mantissa) + B * Vertex.Y(start_a, mantissa=mantissa))
-
-        # Calculate perpendicular distance for start vertex of edgeB
-        start_b = Edge.StartVertex(edgeB)
-        x0, y0 = Vertex.X(start_b, mantissa=mantissa), Vertex.Y(start_b, mantissa=mantissa)
-        distance_start = abs(A * x0 + B * y0 + C)
+        start_a_coords = np.array([Vertex.X(start_a), Vertex.Y(start_a), Vertex.Z(start_a)])
+        end_a_coords = np.array(
+            [Vertex.X(end_a, mantissa=mantissa), Vertex.Y(end_a, mantissa=mantissa), Vertex.Z(end_a, mantissa=mantissa)])
+
+        # Calculate the direction vector of the first edge
+        direction_a = end_a_coords - start_a_coords
+
+        # Normalize the direction vector
+        norm_a = np.linalg.norm(direction_a)
+        if norm_a == 0:
+            print("Edge.IsCollinear - Error: Division by zero. Returning None.")
+            return None
+        direction_a /= norm_a
+
+        # Function to calculate perpendicular distance from a point to the line defined by a point and direction vector
+        def distance_from_line(point, line_point, line_dir):
+            point = np.array([Vertex.X(point, mantissa=mantissa), Vertex.Y(point, mantissa=mantissa),
+                            Vertex.Z(point, mantissa=mantissa)])
+            line_point = np.array(line_point)
+            diff = point - line_point
+            cross_product = np.cross(diff, line_dir)
+            line_dir_norm = np.linalg.norm(line_dir)
+            if line_dir_norm == 0:
+                print("Edge.IsCollinear - Error: Division by zero. Returning None.")
+                return None
+            distance = np.linalg.norm(cross_product) / np.linalg.norm(line_dir)
+            return distance
 
-        # Calculate perpendicular distance for end vertex of edgeB
+        # Get start and end points of the second edge
+        start_b = Edge.StartVertex(edgeB)
         end_b = Edge.EndVertex(edgeB)
-        x0, y0 = Vertex.X(end_b, mantissa=mantissa), Vertex.Y(end_b, mantissa=mantissa)
-        distance_end = abs(A * x0 + B * y0 + C)
+
+        # Calculate distances for start and end vertices of the second edge to the line defined by the first edge
+        distance_start = distance_from_line(start_b, start_a_coords, direction_a)
+        distance_end = distance_from_line(end_b, start_a_coords, direction_a)
 
         # Check if both distances are within tolerance
         return bool(distance_start < tolerance) and bool(distance_end < tolerance)

topologicpy/Topology.py

@@ -1503,7 +1503,7 @@ class Topology():
     @staticmethod
     def ByBREPPath(path):
         """
-        IMports a topology from a BREP file path.
+        Imports a topology from a BREP file path.
 
         Parameters
         ----------
@@ -1525,7 +1525,172 @@ class Topology():
             print("Topology.ByBREPPath - Error: the BREP file is not a valid file. Returning None.")
             return None
         return Topology.ByBREPFile(file)
-    
+
+    @staticmethod
+    def ByDXFFile(file):
+        """
+        Imports a list of topologies from a DXF file.
+        This is an experimental method with limited capabilities.
+
+        Parameters
+        ----------
+        file : a DXF file object
+            The DXF file object.
+
+        Returns
+        -------
+        list
+            The list of imported topologies.
+
+        """
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
+        from topologicpy.Wire import Wire
+        from topologicpy.Shell import Shell
+        from topologicpy.Cell import Cell
+        from topologicpy.CellComplex import CellComplex
+        from topologicpy.Topology import Topology
+
+        try:
+            import ezdxf
+        except:
+            print("Topology.ByDXFFile - Information: Installing required ezdxf library.")
+            try:
+                os.system("pip install ezdxf")
+            except:
+                os.system("pip install ezdxf --user")
+            try:
+                import ezdxf
+                print("Topology.ByDXFFile - Information: ezdxf library installed successfully.")
+            except:
+                warnings.warn("Topology.ByDXFFile - Error: Could not import ezdxf library. Please install it manually. Returning None.")
+                return None
+
+        if not file:
+            print("Topology.ByDXFFile - Error: the input file parameter is not a valid file. Returning None.")
+            return None
+        
+        def convert_entity(entity):
+            entity_type = entity.dxftype()
+            converted_entity = None
+
+            if entity_type == 'POINT':
+                x, y, z = entity.dxf.location.x, entity.dxf.location.y, entity.dxf.location.z
+                converted_entity = Vertex.ByCoordinates(x, y, z)
+
+            elif entity_type == 'LINE':
+                start = Vertex.ByCoordinates(entity.dxf.start.x, entity.dxf.start.y, entity.dxf.start.z)
+                end = Vertex.ByCoordinates(entity.dxf.end.x, entity.dxf.end.y, entity.dxf.end.z)
+                converted_entity = Edge.ByVertices(start, end)
+
+            elif entity_type == 'CIRCLE':
+                origin = Vertex.ByCoordinates(entity.dxf.center.x, entity.dxf.center.y, entity.dxf.center.z)
+                radius = entity.dxf.radius
+                converted_entity = Wire.Circle(origin, radius)
+
+            elif entity_type in ['POLYLINE', 'LWPOLYLINE']:
+                vertices = [Vertex.ByCoordinates(p[0], p[1], p[2]) for p in entity.points()]
+                converted_entity = Wire.ByVertices(vertices)
+
+            elif entity_type == 'ARC':
+                vertices = [Vertex.ByCoordinates(p.x, p.y, p.z) for p in entity.vertices()]
+                converted_entity = Wire.ByVertices(vertices)
+
+            elif entity_type == 'MESH':
+                vertices = [list(v) for v in entity.vertices]
+                faces = [list(face) for face in entity.faces]
+                converted_entity = Topology.SelfMerge(Topology.ByGeometry(vertices=vertices, faces=faces))
+                # Try Cell
+                temp = Cell.ByFaces(Topology.Faces(converted_entity), silent=True)
+                if not Topology.IsInstance(temp, "Cell"):
+                    temp = CellComplex.ByFaces(Topology.Faces(converted_entity))
+                    if not Topology.IsInstance(temp, "CellComplex"):
+                        temp = Shell.ByFaces(Topology.Faces(converted_entity))
+                        if not Topology.IsInstance(temp, "Shell"):
+                            temp = converted_entity
+                converted_entity = temp
+            return converted_entity
+
+        def convert_insert(entity, file):
+            block_name = entity.dxf.name
+            block = file.blocks.get(block_name)
+            converted_entities = []
+
+            for block_entity in block:
+                converted_entity = convert_entity(block_entity)
+                if converted_entity is not None:
+                    converted_entities.append(converted_entity)
+
+            x, y, z = [entity.dxf.insert.x, entity.dxf.insert.y, entity.dxf.insert.z]
+            return [Topology.Translate(obj, x, y, z) for obj in converted_entities]
+
+        def convert_dxf_to_custom_types(file):
+            # Read the DXF file
+            msp = file.modelspace()
+
+            # Store the converted entities
+            converted_entities = []
+
+            # Process each entity in the model space
+            for entity in msp:
+                entity_type = entity.dxftype()
+                if entity_type in ['TEXT', 'MTEXT']:
+                    continue  # Ignore TEXT and MTEXT
+
+                if entity_type == 'INSERT':
+                    converted_entities.extend(convert_insert(entity, file))
+                else:
+                    converted_entity = convert_entity(entity)
+                    if converted_entity is not None:
+                        converted_entities.append(converted_entity)
+
+            return converted_entities
+        converted_entities = convert_dxf_to_custom_types(file)
+        return converted_entities
+
+    @staticmethod
+    def ByDXFPath(path):
+        """
+        Imports a list of topologies from a DXF file path.
+        This is an experimental method with limited capabilities.
+
+        Parameters
+        ----------
+        path : str
+            The path to the DXF file.
+
+        Returns
+        -------
+        list
+            The list of imported topologies.
+
+        """
+        try:
+            import ezdxf
+        except:
+            print("Topology.ExportToDXF - Information: Installing required ezdxf library.")
+            try:
+                os.system("pip install ezdxf")
+            except:
+                os.system("pip install ezdxf --user")
+            try:
+                import ezdxf
+                print("Topology.ByDXFPath - Information: ezdxf library installed successfully.")
+            except:
+                warnings.warn("Topology.ByDXFPath - Error: Could not import ezdxf library. Please install it manually. Returning None.")
+                return None
+        if not path:
+            print("Topology.ByDXFPath - Error: the input path parameter is not a valid path. Returning None.")
+            return None
+        try:
+            file = ezdxf.readfile(path)
+        except:
+            file = None
+        if not file:
+            print("Topology.ByDXFPath - Error: the input file parameter is not a valid file. Returning None.")
+            return None
+        return Topology.ByDXFFile(file)
+
     @staticmethod
     def ByIFCFile(file, transferDictionaries=False, includeTypes=[], excludeTypes=[]):
         """
@@ -1648,7 +1813,6 @@ class Topology():
         try:
             file = ifcopenshell.open(path)
         except:
-            print("Topology.ByIFCPath - Error: the input file parameter is not a valid file. Returning None.")
             file = None
         if not file:
             print("Topology.ByIFCPath - Error: the input file parameter is not a valid file. Returning None.")
@@ -3199,6 +3363,146 @@ class Topology():
             return True
         return False
 
+
+    def ExportToDXF(topologies, path,  overwrite=False):
+        """
+        Exports the input topology to a DXF file. See https://en.wikipedia.org/wiki/AutoCAD_DXF.
+        THe DXF version is 'R2010'
+        This is experimental and only geometry is exported.
+
+        Parameters
+        ----------
+        topologies : list or topologic_core.Topology
+            The input list of topologies. This can also be a single topologic_core.Topology.
+        path : str
+            The input file path.
+        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.
+
+        """
+        import os
+        import warnings
+
+        try:
+            import ezdxf
+        except:
+            print("Topology.ExportToDXF - Information: Installing required ezdxf library.")
+            try:
+                os.system("pip install ezdxf")
+            except:
+                os.system("pip install ezdxf --user")
+            try:
+                import ezdxf
+                print("Topology.ExportToDXF - Information: ezdxf library installed successfully.")
+            except:
+                warnings.warn("Topology.ExportToDXF - Error: Could not import ezdxf library. Please install it manually. Returning None.")
+                return None
+        
+        from topologicpy.Vertex import Vertex
+        from topologicpy.Edge import Edge
+        from topologicpy.Cluster import Cluster
+        from topologicpy.Topology import Topology
+
+        from os.path import exists
+        if not isinstance(topologies, list):
+            topologies = [topologies]
+        topologies = [topology for topology in topologies if Topology.IsInstance(topology, "Topology")]
+        if len(topologies) < 1:
+            print("Topology.ExportToDXF - Error: The inupt list parameter topologies does not contain any valid topologies. Returning None.")
+        # Make sure the file extension is .brep
+        ext = path[len(path)-4:len(path)]
+        if ext.lower() != ".dxf":
+            path = path+".dxf"
+        if not overwrite and exists(path):
+            print("Topology.ExportToDXF - Error: a file already exists at the specified path and overwrite is set to False. Returning None.")
+            return None
+        
+        def add_vertices(vertices, msp):
+            for v in vertices:
+                if Topology.IsInstance(v, "Vertex"):
+                    msp.add_point((Vertex.X(v), Vertex.Y(v), Vertex.Z(v)))
+        def add_edges(edges, msp):
+            for e in edges:
+                if Topology.IsInstance(e, "Edge"):
+                    sv = Edge.StartVertex(e)
+                    ev = Edge.EndVertex(e)
+                    start = (Vertex.X(sv), Vertex.Y(sv), Vertex.Z(sv))
+                    end = (Vertex.X(ev), Vertex.Y(ev), Vertex.Z(ev))
+                    msp.add_line(start, end)
+        def add_wires(wires, msp):
+            for i, w in enumerate(wires):
+                if Topology.IsInstance(w, "Wire"):
+                    block_name = "Wire_"+str(i+1).zfill(3)
+                    block = doc.blocks.new(name=block_name)
+                    # Add edges to the block
+                    edges = Topology.Edges(w)
+                    for edge in edges:
+                        sv = Edge.StartVertex(edge)
+                        ev = Edge.EndVertex(edge)
+                        start = (Vertex.X(sv), Vertex.Y(sv), Vertex.Z(sv))
+                        end = (Vertex.X(ev), Vertex.Y(ev), Vertex.Z(ev))
+                        block.add_line(start, end)
+                    # Insert the block into the model space
+                    msp.add_blockref(block_name, insert=(0, 0, 0))
+        def add_meshes(meshes, msp):
+            for m in meshes:
+                data = Topology.Geometry(m)
+                vertices = data['vertices']
+                faces = data['faces']
+                mesh = msp.add_mesh()
+                mesh.dxf.subdivision_levels = 0
+                with mesh.edit_data() as mesh_data:
+                    mesh_data.vertices = vertices
+                    mesh_data.faces = faces
+        # Create a new DXF document
+        doc = ezdxf.new(dxfversion='R2010')
+        msp = doc.modelspace()
+        i = 1
+        for topology in topologies:
+            if Topology.IsInstance(topology, "Vertex"):
+                add_vertices([topology], msp)
+            elif Topology.IsInstance(topology, "Edge"):
+                add_edges([topology], msp)
+            elif Topology.IsInstance(topology, "Wire"):
+                add_wires([topology], msp)
+            elif Topology.IsInstance(topology, "Face"):
+                add_meshes([topology], msp)
+            elif Topology.IsInstance(topology, "Shell"):
+                add_meshes([topology], msp)
+            elif Topology.IsInstance(topology, "Cell"):
+                add_meshes([topology], msp)
+            elif Topology.IsInstance(topology, "CellComplex"):
+                add_meshes([topology], msp)
+            elif Topology.IsInstance(topology, "Cluster"):
+                cellComplexes = Topology.CellComplexes(topology)
+                add_meshes(cellComplexes, msp)
+                cells = Cluster.FreeCells(topology)
+                add_meshes(cells, msp)
+                shells = Cluster.FreeShells(topology)
+                add_meshes(shells, msp)
+                faces = Cluster.FreeFaces(topology)
+                add_meshes(faces, msp)
+                wires = Cluster.FreeWires(topology)
+                add_wires(wires, msp)
+                edges = Cluster.FreeEdges(topology)
+                add_edges(edges, msp)
+                vertices = Cluster.FreeVertices(topology)
+                add_vertices(vertices, msp)
+        
+        # Save the DXF document
+        status = False
+        try:
+            doc.saveas(path)
+            status = True
+        except:
+            status = False
+        return status
+
     '''
     @staticmethod
     def ExportToIPFS(topology, url, port, user, password):

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.2'
+__version__ = '0.7.4'

{topologicpy-0.7.2.dist-info → topologicpy-0.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.2
+Version: 0.7.4
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: GNU AFFERO GENERAL PUBLIC LICENSE

{topologicpy-0.7.2.dist-info → topologicpy-0.7.4.dist-info}/RECORD

@@ -6,7 +6,7 @@ topologicpy/Color.py,sha256=UlmRcCSOhqcM_OyMWz4t3Kr75KcgXDhz3uctAJ2n7Ic,18031
 topologicpy/Context.py,sha256=ppApYKngZZCQBFWaxIMi2z2dokY23c935IDCBosxDAE,3055
 topologicpy/DGL.py,sha256=RpkLnAzjg6arY7cEMs2pDFYzRdkerVg1Wbm9hcE3QaM,138991
 topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,25891
-topologicpy/Edge.py,sha256=ktCp2VgBj-QvrUQ0oagTZG2QErth9cilzaBhhHeYNB8,50321
+topologicpy/Edge.py,sha256=jbJHyPHlLF94RkUKL479B4dPC202K0Xd7bQsPcFwoHc,51296
 topologicpy/EnergyModel.py,sha256=UBLim01lZLikVQmJAHEeja-KvF4tgzTxsSxwNDaezz4,52500
 topologicpy/Face.py,sha256=BOU6hN-4uCaXW_lbvuOlntrz_Q0jEiL5tIHAFuqWw_U,97195
 topologicpy/Graph.py,sha256=GsWySXL-cTd7bl-QWpl3Aw9Hr0KyACzIa4iRenTB63s,368030
@@ -20,14 +20,14 @@ topologicpy/Polyskel.py,sha256=MYHKFOQBlUNqoUhAdOcKRIHpSk0dWWVrZgXK34NkvFM,15936
 topologicpy/Shell.py,sha256=6hidTQ6MW5q_es-WbTeI_yt7Sd7BMxWU_qfoherVZhE,74343
 topologicpy/Speckle.py,sha256=rUS6PCaxIjEF5_fUruxvMH47FMKg-ohcoU0qAUb-yNM,14267
 topologicpy/Sun.py,sha256=3tYb8kssU882lE1gEWg2mxDvCCY_LAVElkyUT6wa-ZU,36935
-topologicpy/Topology.py,sha256=oXZZGGklFeVMIcKorVXM5RFMbCnoYcjdrScTIodSQng,292911
+topologicpy/Topology.py,sha256=qyk9y3pdsvU_hCLESBsWwN6zM_P5BBirEdhvuxnjkHM,305348
 topologicpy/Vector.py,sha256=FHbrCb9GVLOUV_kqcplh4D88CVxlID6qX_wEQOw4rD0,29565
 topologicpy/Vertex.py,sha256=YgbbCcqABvb97z2-yEytpp5T3yoZPlQplR_vMQkQ9OA,65180
 topologicpy/Wire.py,sha256=MUEboxo11kMgwnZySSkwiyzBG2wv0wPiinf2cW4UVv8,138424
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=0eAFjnFVSWI6_301EfFzaXJIiwNScF9GpeINoCLd-XM,22
-topologicpy-0.7.2.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
-topologicpy-0.7.2.dist-info/METADATA,sha256=mUXBHGbD8IpLymaCvTw5wyJmhssEstUU57P6bXuYFkk,46950
-topologicpy-0.7.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.7.2.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.2.dist-info/RECORD,,
+topologicpy/version.py,sha256=lBlBxbnftiADKPpC3XRA3jUPjRsVclCd3P95aQ33p_g,22
+topologicpy-0.7.4.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
+topologicpy-0.7.4.dist-info/METADATA,sha256=ELxHFRNJM71bITDzS-ZmOxF5xDaS3PuoxphPYTZ7HOQ,46950
+topologicpy-0.7.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.7.4.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.4.dist-info/RECORD,,