algo

PVPlantEarthWorks.py

@@ -5,6 +5,7 @@ import Part
 import ArchComponent
 from pivy import coin
 import numpy as np
+import DraftGeomUtils
 
 if FreeCAD.GuiUp:
     import FreeCADGui, os
@@ -516,6 +517,7 @@ class EarthWorksTaskPanel:
             return False
 
         FreeCAD.ActiveDocument.openTransaction("Calcular movimiento de tierras")
+
         def calculateEarthWorks(line, extreme=False):
             pts = []
             pts1 = []
@@ -576,33 +578,6 @@ class EarthWorksTaskPanel:
         elif ver == 1:
             from PVPlantPlacement import getCols
             columns = getCols(frames)
-
-            '''colelements = set()
-            rowelements = set()
-            for groups in columns:
-                for group in groups:
-                    for frame in group:
-                        colelements.add(frame.Placement.Base.x)
-                        rowelements.add(frame.Placement.Base.y)
-            colelements = sorted(colelements)
-            rowelements = sorted(rowelements, reverse=True)
-            print("Cols: ", len(colelements), " - ", colelements)
-            print("Rows: ", len(rowelements), " - ", rowelements)
-
-            a = []
-            colnum = len(colelements)
-            for r in range(len(rowelements)):
-                a.append([None] * colnum)
-            mat = np.array(a, dtype=object)
-            for groups in columns:
-                for group in groups:
-                    for frame in group:
-                        colidx = colelements.index(frame.Placement.Base.x)
-                        rowidx = rowelements.index(frame.Placement.Base.y)
-                        mat[rowidx][colidx] = frame
-            print(mat)
-            return'''
-
             for groups in columns:
                 for group in groups:
                     first = group[0]
@@ -709,44 +684,41 @@ class EarthWorksTaskPanel:
             import Mesh
             pro = utils.getProjected(sh)
             pro = utils.simplifyWire(pro)
-            #pro = pro.makeOffset2D(20000, 2, False, False, True)
-            Part.show(sh, "loft")
-            Part.show(pro, "pro")
             pts = [ver.Point for ver in pro.Vertexes]
-            '''if pts[0] != pts[-1]:
-                pts.append(pts[0])'''
             land.trim(pts, 1)
+
             tmp = []
             for face in sh.Faces:
                 wire = face.Wires[0].copy()
                 pl = wire.Placement.Base
                 wire.Placement.Base = wire.Placement.Base - pl
-                wire = wire.scale(2)
-                wire.Placement.Base = wire.Placement.Base + pl
-                #wire = wire.makeOffset2D(10000, 0, False, False, True)
-                wire.Placement.Base.z = wire.Placement.Base.z - 10000
-                face1 = Part.makeLoft([face.Wires[0], wire], True, True, False)
 
+                if DraftGeomUtils.isPlanar(wire):
+                    # Caso simple
+                    wire = wire.makeOffset2D(10000, 0, False, False, True)
+                    wire.Placement.Base.z = wire.Placement.Base.z - 10000
+                    wire = wire.makeFillet(1, wire.Edges)
+                    tmp.append(Part.makeLoft([face.Wires[0], wire], True, True, False))
+                else:
+                    # Caso complejo:
+                    vertices = face.Vertexes
+                    # Dividir rectángulo en 2 triángulos
+                    triangles = [
+                        [vertices[0], vertices[1], vertices[2]],
+                        [vertices[2], vertices[3], vertices[0]]
+                    ]
 
-                Part.show(face1, "tool")
-                #tmp.append(face.extrude(FreeCAD.Vector(0, 0, -10000)))
-                #Part.show(tmp[-1], "face-extrude")
-            sh = sh.extrude(FreeCAD.Vector(0, 0, -10000))
-            sh = Part.Solid(sh)
-            Part.show(sh)
-            import MeshPart as mp
-            msh = mp.meshFromShape(Shape=sh)  # , MaxLength=1)
-            # msh = msh.smooth("Laplace", 3)
-            Mesh.show(msh, "tool")
-            Mesh.show(land, "trim")
-            '''inner = msh.inner(land)
-            Mesh.show(inner)
-            outer = msh.inner(land)
-            Mesh.show(outer)'''
-            '''intersec = land.section(msh, MinDist=0.01)
-            import Draft
-            for sec in intersec:
-                Draft.makeWire(sec)'''
+                    for tri in triangles:
+                        # Crear wire triangular
+                        wire = Part.makePolygon([v.Point for v in tri] + [tri[0].Point])
+                        # Hacer offset (ahora es coplanar por ser triángulo)
+                        wire = wire.makeOffset2D(10000, 0, False, False, True)
+                        wire.Placement.Base.z = wire.Placement.Base.z - 10000
+                        wire = wire.makeFillet(1, wire.Edges)
+                        tmp.append(Part.makeLoft([face.Wires[0], wire], True, True, False))
+
+            final_tool = Part.makeCompound(tmp)
+            Part.show(final_tool, "tool")
 
             FreeCAD.ActiveDocument.commitTransaction()
             self.closeForm()
@@ -964,4 +936,5 @@ def accept():
 
     FreeCAD.ActiveDocument.commitTransaction()
     self.closeForm()
-    return True
+    return True
+