topologicpy 0.7.3__py3-none-any.whl → 0.7.5__py3-none-any.whl

topologicpy/Face.py

@@ -1909,7 +1909,7 @@ class Face():
         return Face.ByWire(wire)
     
     @staticmethod
-    def Star(origin= None, radiusA: float = 1.0, radiusB: float = 0.4, rays: int = 5, direction: list = [0, 0, 1], placement: str = "center", tolerance: float = 0.0001):
+    def Star(origin= None, radiusA: float = 0.5, radiusB: float = 0.2, rays: int = 8, direction: list = [0, 0, 1], placement: str = "center", tolerance: float = 0.0001):
         """
         Creates a star.
 

topologicpy/Topology.py

@@ -871,6 +871,7 @@ class Topology():
         See Topology.Boolean().
 
         """
+        from topologicpy.Cluster import Cluster
 
         if topologyA == None:
             return None
@@ -884,27 +885,24 @@ class Topology():
             topologyA = topologyB
             topologyB = temp
         
-        if Topology.IsInstance(topologyB, "CellComplex") or Topology.IsInstance(topologyB, "Cluster"):
-            merge = Topology.Merge(topologyA, topologyB)
-            symdif = Topology.SymDif(topologyA, topologyB)
-            return Topology.Difference(merge, symdif)
+        results = []
+        if Topology.IsInstance(topologyA, "CellComplex"):
+           cellsA = Topology.Cells(topologyA)
         else:
-        # Vertex:
-            if Topology.IsInstance(topologyA, "Vertex"):
-                # Vertex:
-                if Topology.IsInstance(topologyB, "Vertex"):
-                    if Vertex.Distance(topologyA, topologyB) < tolerance:
-                        return topologyA
-                    else:
-                        return None
-                # Edge/Wire/Face/Shell/Cell:
-                else:
-                    if Vertex.IsInternal(topologyA, topologyB):
-                        return topologyA
-                    else:
-                        return None
+            cellsA = [topologyA]
+        for cellA in cellsA:
+            if Topology.IsInstance(topologyB, "CellComplex"):
+                cellsB = Topology.Cells(topologyB)
             else:
-                return topologyA.Intersect(topologyB)
+                cellsB = [topologyB]
+            for cellB in cellsB:
+                cellC = cellA.Intersect(cellB)
+                results.append(cellC)
+        results = [x for x in results if results is not None]
+        if len(results) == 1:
+            return results[0]
+        else:
+            return Topology.SelfMerge(Topology.SelfMerge(Cluster.ByTopologies(results)))
     
     @staticmethod
     def SymmetricDifference(topologyA, topologyB, tranDict=False, tolerance=0.0001):
@@ -1503,7 +1501,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 +1523,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 +1811,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.")

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.3'
+__version__ = '0.7.5'

{topologicpy-0.7.3.dist-info → topologicpy-0.7.5.dist-info}/METADATA

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

@@ -8,7 +8,7 @@ topologicpy/DGL.py,sha256=RpkLnAzjg6arY7cEMs2pDFYzRdkerVg1Wbm9hcE3QaM,138991
 topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,25891
 topologicpy/Edge.py,sha256=jbJHyPHlLF94RkUKL479B4dPC202K0Xd7bQsPcFwoHc,51296
 topologicpy/EnergyModel.py,sha256=UBLim01lZLikVQmJAHEeja-KvF4tgzTxsSxwNDaezz4,52500
-topologicpy/Face.py,sha256=BOU6hN-4uCaXW_lbvuOlntrz_Q0jEiL5tIHAFuqWw_U,97195
+topologicpy/Face.py,sha256=clf0qf8c0SnzOUOHw11Z4e_Y4ovhRmSOGmPd5_50Fa8,97195
 topologicpy/Graph.py,sha256=GsWySXL-cTd7bl-QWpl3Aw9Hr0KyACzIa4iRenTB63s,368030
 topologicpy/Grid.py,sha256=XM0iQtQbMQoYHf7S0ppSe-dxy93Y9VpI_vUkElWqnYA,17050
 topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
@@ -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=limcBROvZgD5xanXLi57WgOvR9e93-MkYZcFtFgctu0,298938
+topologicpy/Topology.py,sha256=VShlTik3ggY4Ch4649p3SGZ8UyXIsQ7t3KQO7bjRN8A,305176
 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=i5zhgfscuWC8vabp6pP1S6z_O5355x2aIv0so00_cmo,22
-topologicpy-0.7.3.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
-topologicpy-0.7.3.dist-info/METADATA,sha256=TdJMT-64j4LX5i_DSX8qg-5jNgUSETUla-Mi9AMjkic,46950
-topologicpy-0.7.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.7.3.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.3.dist-info/RECORD,,
+topologicpy/version.py,sha256=YGgeu1tBDTiiHbKl1TkbKHeb7CjnrObEQKS9Miv1iBU,22
+topologicpy-0.7.5.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
+topologicpy-0.7.5.dist-info/METADATA,sha256=pTjF0iR8gLPPQ8E7s7A0-fDMrm5vepTlMF88sjztM2M,46950
+topologicpy-0.7.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.7.5.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.5.dist-info/RECORD,,