Punto de restauración.

.idea/PVPlant.iml

@@ -5,4 +5,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
+  <component name="PackageRequirementsSettings">
+    <option name="removeUnused" value="true" />
+    <option name="modifyBaseFiles" value="true" />
+  </component>
 </module>

Civil/Fence/PVPlantFence.py

@@ -20,16 +20,18 @@
 # *                                                                     *
 # ***********************************************************************
 
+import FreeCAD
+import Part
+import Draft
+import MeshPart as mp
+import ArchComponent
+
+import Civil.Fence.PVPlantFencePost as PVPlantFencePost
+import PVPlantSite
+import Utils.PVPlantUtils as utils
 import copy
 import math
 
-import ArchComponent
-import Draft
-import FreeCAD
-import Part
-
-import PVPlantFencePost
-import PVPlantSite
 
 if FreeCAD.GuiUp:
     import FreeCADGui
@@ -56,26 +58,28 @@ from PVPlantResources import DirIcons as DirIcons
 
 EAST = FreeCAD.Vector(1, 0, 0)
 
-def makeprojection(pathwire):
-    site = FreeCAD.ActiveDocument.Site
-    land = site.Terrain.Shape
-    proj = land.makeParallelProjection(pathwire, FreeCAD.Vector(0, 0, 1))
-    return proj
-
 def makePVPlantFence(section, post, path):
     obj = FreeCAD.ActiveDocument.addObject('Part::FeaturePython', 'Fence')
 
-    _Fence(obj)
+    Fence(obj)
     obj.Post = post
     obj.Base = path
 
     if FreeCAD.GuiUp:
-        _ViewProviderFence(obj.ViewObject)
+        ViewProviderFence(obj.ViewObject)
 
         hide(section)
         hide(post)
         hide(path)
 
+    try:
+        fende_group = FreeCAD.ActiveDocument.Fences
+    except:
+        fende_group = FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroup", 'Fences')
+        fende_group.Label = "Fences"
+        FreeCAD.ActiveDocument.CivilGroup.addObject(fende_group)
+    fende_group.addObject(obj)
+
     FreeCAD.ActiveDocument.recompute()
     return obj
 
@@ -83,16 +87,8 @@ def hide(obj):
     if hasattr(obj, 'ViewObject') and obj.ViewObject:
         obj.ViewObject.Visibility = False
 
-def getAngle(Line1, Line2):
-    v1 = Line1.Vertexes[1].Point - Line1.Vertexes[0].Point
-    v2 = Line2.Vertexes[1].Point - Line2.Vertexes[0].Point
-    return v1.getAngle(v2)
-
-
-def get_parameter_from_v0(edge, offset):
-    """Return parameter at distance offset from edge.Vertexes[0].
-    sb method in Part.TopoShapeEdge???
-    """
+def get_parameter_from_v0_old(edge, offset):
+    """ Return parameter at distance offset from edge.Vertexes[0].sb method in Part.TopoShapeEdge??? """
     import DraftVecUtils
 
     lpt = edge.valueAt(edge.getParameterByLength(0))
@@ -106,14 +102,16 @@ def get_parameter_from_v0(edge, offset):
         length = offset
     return edge.getParameterByLength(length)
 
+def get_parameter_from_v0(edge, offset):
+    """Parámetro a distancia offset desde el primer vértice"""
+    lpt = edge.valueAt(edge.getParameterByLength(0))
+    vpt = edge.Vertexes[0].Point
+
+    if not vpt.isEqual(lpt, 1e-6):
+        return edge.getParameterByLength(edge.Length - offset)
+    return edge.getParameterByLength(offset)
 
 def calculatePlacement(globalRotation, edge, offset, RefPt, xlate, align, normal=None):
-    """Orient shape to tangent at parm offset along edge."""
-    import functools
-    import DraftVecUtils
-    # http://en.wikipedia.org/wiki/Euler_angles
-    # start with null Placement point so translate goes to right place.
-
     placement = FreeCAD.Placement()
     placement.Rotation = globalRotation
     placement.move(RefPt + xlate)
@@ -121,55 +119,23 @@ def calculatePlacement(globalRotation, edge, offset, RefPt, xlate, align, normal
     if not align:
         return placement
 
-    # unit +Z  Probably defined elsewhere?
-    z = FreeCAD.Vector(0, 0, 1)
-    # y = FreeCAD.Vector(0, 1, 0)               # unit +Y
-    x = FreeCAD.Vector(1, 0, 0)  # unit +X
-    nullv = FreeCAD.Vector(0, 0, 0)
+    t = edge.tangentAt(get_parameter_from_v0(edge, offset)).normalize()
+    n = normal or FreeCAD.Vector(0, 0, 1)
+    b = t.cross(n).normalize()
 
-    # get local coord system - tangent, normal, binormal, if possible
-    t = edge.tangentAt(get_parameter_from_v0(edge, offset))
-    t.normalize()
-    n = normal
-    b = t.cross(n)
-    b.normalize()
+    # Asegurar sistema de coordenadas derecho
+    if n.dot(t.cross(b)) < 0:
+        b = -b
 
-    lnodes = z.cross(b)
-    try:
-        # Can't normalize null vector.
-        lnodes.normalize()
-    except:
-        # pathological cases:
-        pass
-
-    print(b, " - ", b.dot(z))
-    if abs(b.dot(z)) == 1.0:  # 2) binormal is || z
-        # align shape to tangent only
-        psi = math.degrees(DraftVecUtils.angle(x, t, z))
-        theta = 0.0
-        phi = 0.0
-        FreeCAD.Console.PrintWarning("Draft PathArray.orientShape - Gimbal lock. Infinite lnodes. Change Path or Base.\n")
-    else:  # regular case
-        psi = math.degrees(DraftVecUtils.angle(x, lnodes, z))
-        theta = math.degrees(DraftVecUtils.angle(z, b, lnodes))
-        phi = math.degrees(DraftVecUtils.angle(lnodes, t, b))
-
-    rotations = [placement.Rotation]
-
-    if psi != 0.0:
-        rotations.insert(0, FreeCAD.Rotation(z, psi))
-    if theta != 0.0:
-        rotations.insert(0, FreeCAD.Rotation(lnodes, theta))
-    if phi != 0.0:
-        rotations.insert(0, FreeCAD.Rotation(b, phi))
-
-    if len(rotations) == 1:
-        finalRotation = rotations[0]
-    else:
-        finalRotation = functools.reduce(lambda rot1, rot2: rot1.multiply(rot2), rotations)
-
-    placement.Rotation = FreeCAD.Rotation(FreeCAD.Vector(0, 0, 1), finalRotation.toEuler()[2])
+    # Construir matriz
+    rotation_matrix = FreeCAD.Matrix(
+        t.x, b.x, n.x, 0,
+        t.y, b.y, n.y, 0,
+        t.z, b.z, n.z, 0,
+        0, 0, 0, 1
+    )
 
+    placement.Rotation = FreeCAD.Rotation(rotation_matrix)
     return placement
 
 def calculatePlacementsOnPath(shapeRotation, pathwire, count, xlate, align):
@@ -183,12 +149,8 @@ def calculatePlacementsOnPath(shapeRotation, pathwire, count, xlate, align):
     import DraftGeomUtils
 
     closedpath = DraftGeomUtils.isReallyClosed(pathwire)
-    normal = DraftGeomUtils.getNormal(pathwire)
-    if normal:
-        if normal.z < 0:  # asegurarse de que siempre se dibuje por encima del suelo
-            normal.z *= -1
-    else:
-        normal = FreeCAD.Vector(0, 0, 1)
+
+    normal = FreeCAD.Vector(0, 0, 1)
     path = Part.__sortEdges__(pathwire.Edges)
     ends = []
     cdist = 0
@@ -241,7 +203,7 @@ def calculatePlacementsOnPath(shapeRotation, pathwire, count, xlate, align):
 
     return placements
 
-class _Fence(ArchComponent.Component):
+class Fence(ArchComponent.Component):
     def __init__(self, obj):
         ArchComponent.Component.__init__(self, obj)
         self.setProperties(obj)
@@ -347,7 +309,6 @@ class _Fence(ArchComponent.Component):
                             QT_TRANSLATE_NOOP("App::Property", "The number of posts used to build the fence"))
             obj.setEditorMode("Length", 1)
 
-
         self.Type = "PVPlatFence"
 
     def __getstate__(self):
@@ -361,75 +322,30 @@ class _Fence(ArchComponent.Component):
         return None
 
     def execute(self, obj):
+        if not obj.Base or not obj.Post:
+            return
 
+        # 1. Preparar trazado base
         pathwire = self.calculatePathWire(obj)
-        if pathwire is None:
-            # FreeCAD.Console.PrintLog("ArchFence.execute: path " + obj.Base.Name + " has no edges\n")
-            return
-
-        if not obj.Post:
-            FreeCAD.Console.PrintLog("ArchFence.execute: Post not set\n")
+        pathwire = utils.getProjected(pathwire, FreeCAD.Vector(0, 0, 1))
+        pathwire = utils.simplifyWire(pathwire)
+        if not pathwire or not pathwire.Edges:
             return
 
+        # 2. Proyectar sobre terreno (con caché)
         self.Posts = []
         self.Foundations = []
-        site = PVPlantSite.get()
-        if True:  # prueba
-            import MeshPart as mp
-            land = FreeCAD.ActiveDocument.Terrain.Mesh
-            segments = mp.projectShapeOnMesh(pathwire, land, FreeCAD.Vector(0, 0, 1))
-            points=[]
-            for segment in segments:
-                points.extend(segment)
-            pathwire = Part.makePolygon(points)
-        else:
-            if PVPlantSite.get().Terrain.TypeId == 'Mesh::Feature':
-                import MeshPart as mp
-                land = PVPlantSite.get().Terrain.Mesh
-                pathwire = mp.projectShapeOnMesh(pathwire, land, FreeCAD.Vector(0, 0, 1))
 
-            else:
-                land = site.Terrain.Shape
-                pathwire = land.makeParallelProjection(pathwire, FreeCAD.Vector(0, 0, 1))
+        site = PVPlantSite.get()
+        segments = mp.projectShapeOnMesh(pathwire, site.Terrain.Mesh, FreeCAD.Vector(0, 0, 1))
+        points=[]
+        for segment in segments:
+            points.extend(segment)
+        pathwire = Part.makePolygon(points)
 
         if pathwire is None:
             return
 
-        ''' no sirve:
-        if len(pathwire.Wires) > 1:
-            import draftgeoutils
-            pathwire = draftgeoutils.wires.superWire(pathwire.Edges, True)
-            Part.show(pathwire)
-        '''
-
-        ''' unir todas en una '''
-        '''
-        if len(pathwire.Wires) > 1:
-            import Utils.PVPlantUtils as utils
-            wires = pathwire.Wires
-            new_wire = []
-            to_compare = utils.getPoints(wires.pop(0))
-            new_wire.extend(to_compare)
-            while len(wires)>0:
-                wire = wires[0]
-                points = utils.getPoints(wire)
-                to_remove = None
-                if points[0] in to_compare:
-                    to_remove = points[0]
-                if points[-1] in to_compare:
-                    to_remove = points[-1]
-                if to_remove:
-                    to_compare = points.copy()
-                    points.remove(to_remove)
-                    new_wire.extend(points)
-                    wires.pop()
-                    continue
-                wires.append(wires.pop())
-            pathwire = Part.makePolygon(new_wire)
-            #Part.show(pathwire)
-        #return
-        '''
-
         sectionLength = obj.Gap.Value
         postLength = 0 #obj.Post.Diameter.Value   #considerarlo 0 porque no influye
         postPlacements = []
@@ -457,18 +373,19 @@ class _Fence(ArchComponent.Component):
 
             postPlacements.extend(placements)
 
+        # 5. Generar geometría
         postShapes, postFoundation = self.calculatePosts(obj, postPlacements)
-        sections, num = self.calculateSections(obj, postPlacements)
+        mesh = self.calculate_sections(obj, postPlacements)
 
         postShapes = Part.makeCompound(postShapes)
         postFoundation = Part.makeCompound(postFoundation)
-        sections = Part.makeCompound(sections)
-        compound = Part.makeCompound([postShapes, postFoundation, sections])
-        obj.Shape = compound
 
-        # Give information
+        # 6. Crear forma final
+        obj.Shape = Part.makeCompound([postShapes, postFoundation, mesh])
+
+        # 7. Actualizar propiedades
         obj.NumberOfSections = count
-        obj.NumberOfPosts = obj.NumberOfSections + 1
+        obj.NumberOfPosts = count + 1
         obj.Length = pathLength
         obj.Concrete = count * postFoundation.SubShapes[0].Volume
 
@@ -497,7 +414,7 @@ class _Fence(ArchComponent.Component):
 
     def calculatePostPlacements(self, obj, pathwire, rotation):
         postWidth = obj.Post.Diameter.Value
-        transformationVector = FreeCAD.Vector(0, postWidth / 2, 0)
+        transformationVector = FreeCAD.Vector(0,  - postWidth / 2, 0)
         placements = calculatePlacementsOnPath(rotation, pathwire, int(obj.NumberOfSections) + 1, transformationVector, True)
         # The placement of the last object is always the second entry in the list.
         # So we move it to the end:
@@ -509,47 +426,36 @@ class _Fence(ArchComponent.Component):
         posts = []
         foundations = []
         for placement in postPlacements:
-            postCopy = obj.Post.Shape.copy()
-            postCopy = Part.Solid(postCopy)
-            postCopy.Placement = placement
-            postCopy.Placement.Base.z += 100
-            posts.append(postCopy)
+            new_post = obj.Post.Shape.copy()
+            new_post = Part.Solid(new_post)
+            new_post.Placement = placement
+            new_post.Placement.Base.z += 100
+            posts.append(new_post)
 
             foundation = Part.makeCylinder(150, 700)
             foundation.Placement = placement
             foundation.Placement.Base.z -= obj.Depth.Value
-            foundation = foundation.cut(postCopy)
+            #foundation = foundation.cut(new_post)
             foundations.append(foundation)
 
         return posts, foundations
 
-    def calculateSections(self, obj, postPlacements):
-        shapes = []
-        faceNumbers = []
+    def calculate_sections(self, obj, postPlacements):
+        offsetz = FreeCAD.Vector(0, 0, obj.MeshOffsetZ.Value)
+        meshHeight = FreeCAD.Vector(0, 0, obj.MeshHeight.Value)
 
-        offsetz = obj.MeshOffsetZ.Value
-        meshHeight = obj.MeshHeight.Value
+        points_down = []
+        points_up = []
         for i in range(len(postPlacements) - 1):
-            startPlacement = postPlacements[i]
-            endPlacement = postPlacements[i + 1]
+            p1 = postPlacements[i].Base + offsetz
+            p2 = postPlacements[i + 1].Base + offsetz
+            p3 = p1 + meshHeight
+            p4 = p2 + meshHeight
+            points_down.extend([p1, p2])
+            points_up.extend([p3, p4])
 
-            p1 = startPlacement.Base + FreeCAD.Vector(0, 0, offsetz)
-            p2 = endPlacement.Base + FreeCAD.Vector(0, 0, offsetz)
-            p3 = p2 + FreeCAD.Vector(0, 0, meshHeight)
-            p4 = p1 + FreeCAD.Vector(0, 0, meshHeight)
-            pointlist = [p1, p2, p3, p4, p1]
-
-            try:
-                pol = Part.makePolygon(pointlist)
-                face = Part.Face(pol)
-                shapes.append(face)
-                faceNumbers.append(1)
-            except:
-                print("No es posible crear la cara: ---------------------------------------------------")
-                print("  +++++ Start: ", startPlacement.Base, " - end: ", endPlacement.Base)
-                print("  +++++ algo: ", pointlist, "\n")
-                print("---------------------------------------------------\n")
-        return (shapes, faceNumbers)
+        shape = Part.makeRuledSurface(Part.makePolygon(points_down), Part.makePolygon(points_up))
+        return shape
 
     def calculatePathWire(self, obj):
         if obj.Base:
@@ -562,7 +468,7 @@ class _Fence(ArchComponent.Component):
         return None
 
 
-class _ViewProviderFence(ArchComponent.ViewProviderComponent):
+class ViewProviderFence(ArchComponent.ViewProviderComponent):
     "A View Provider for the Fence object"
 
     def __init__(self, vobj):
@@ -642,7 +548,7 @@ class _ViewProviderFence(ArchComponent.ViewProviderComponent):
             children.append(self.Object.Gate)
         return children
 
-class _FenceTaskPanel:
+class FenceTaskPanel:
     '''The TaskPanel to setup the fence'''
 
     def __init__(self):
@@ -775,15 +681,8 @@ class _FenceTaskPanel:
         self.form = [self.formFence, self.formPost, self.formFoundation]
 
         # valores iniciales y creación del la valla:
-        import Draft
-        self.post = PVPlantFencePost.makeFencePost()  # Arch.makePipe()
+        self.post = PVPlantFencePost.makeFencePost()
         self.post.Label = "Post"
-        Draft.autogroup(self.post)
-
-        '''
-        self.section = self.makeGrid()
-        self.path = self.section.Base
-        '''
 
         FreeCAD.ActiveDocument.recompute()
         self.fence = makePVPlantFence(self.section, self.post, self.path)
@@ -859,7 +758,7 @@ class CommandPVPlantFence:
         return not FreeCAD.ActiveDocument is None
 
     def Activated(self):
-        self.TaskPanel = _FenceTaskPanel()
+        self.TaskPanel = FenceTaskPanel()
         FreeCADGui.Control.showDialog(self.TaskPanel)
 
 
@@ -877,12 +776,13 @@ if FreeCAD.GuiUp:
                     }
 
         def IsActive(self):
+            site = FreeCAD.ActiveDocument.getObject("Site")
             return (not (FreeCAD.ActiveDocument is None) and
-                    not (FreeCAD.ActiveDocument.getObject("Site") is None) and
-                    not (FreeCAD.ActiveDocument.getObject("Terrain") is None))
+                    not (site is None) and
+                    not (site.Terrain is None))
 
-    import PVPlantFenceGate
+    import Civil.Fence.PVPlantFenceGate as PVPlantFenceGate
     FreeCADGui.addCommand('PVPlantFence', CommandPVPlantFence())
-    FreeCADGui.addCommand('PVPlantGate', PVPlantFenceGate._CommandPVPlantGate())
-    FreeCADGui.addCommand('PVPlantFencePost', PVPlantFencePost._CommandFencePost())
+    FreeCADGui.addCommand('PVPlantGate', PVPlantFenceGate.CommandPVPlantGate())
+    FreeCADGui.addCommand('PVPlantFencePost', PVPlantFencePost.CommandFencePost())
     #FreeCADGui.addCommand('PVPlantFenceGroup', CommandFenceGroup())

Civil/Fence/PVPlantFenceGate.py

@@ -202,7 +202,7 @@ class ViewProviderGate:
             children.append(self.Object.Base)
         return children
 
-class _CommandPVPlantGate:
+class CommandPVPlantGate:
     "the PVPlant Fence command definition"
 
     def __init__(self):
@@ -256,7 +256,9 @@ class _CommandPVPlantGate:
             gate = makePVPlantFence()
             try:
                 import MeshPart as mp
-                point1 = mp.projectPointsOnMesh([point1,], FreeCAD.ActiveDocument.Terrain.Mesh, FreeCAD.Vector(0, 0, 1))[0]
+                import PVPlantSite
+                site = PVPlantSite.get()
+                point1 = mp.projectPointsOnMesh([point1,], site.Terrain.Mesh, FreeCAD.Vector(0, 0, 1))[0]
 
             except:
                 FreeCAD.Console.PrintError("No se puede encontrar punto 3D.." + "\n")

Civil/Fence/PVPlantFencePost.py

@@ -1,5 +1,6 @@
-import ArchComponent
 import FreeCAD
+import Part
+import ArchComponent
 
 if FreeCAD.GuiUp:
     import FreeCADGui
@@ -9,8 +10,6 @@ else:
     # \cond
     def translate(ctxt, txt):
         return txt
-
-
     def QT_TRANSLATE_NOOP(ctxt, txt):
         return txt
     # \endcond
@@ -21,20 +20,14 @@ except AttributeError:
     def _fromUtf8(s):
         return s
 
-
-def makeFencePost(diameter=48, length=3000, placement=None, name="Post"):
-    "makePipe([baseobj,diamerter,length,placement,name]): creates an pipe object from the given base object"
-
-    if not FreeCAD.ActiveDocument:
-        FreeCAD.Console.PrintError("No active document. Aborting\n")
-        return
+def makeFencePost(diameter=48, length=3000, placement=None, name="FencePost"):
 
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython", name)
     obj.Label = name
-    _FencePost(obj)
+    FencePost(obj)
 
     if FreeCAD.GuiUp:
-        _ViewProviderFencePost(obj.ViewObject)
+        ViewProviderFencePost(obj.ViewObject)
 
     obj.Length = length
     obj.Diameter = diameter
@@ -45,18 +38,13 @@ def makeFencePost(diameter=48, length=3000, placement=None, name="Post"):
 
 
 def makeFenceReinforcePost(diameter=48, length=3000, placement=None, name="Post"):
-    "makePipe([baseobj,diamerter,length,placement,name]): creates an pipe object from the given base object"
-
-    if not FreeCAD.ActiveDocument:
-        FreeCAD.Console.PrintError("No active document. Aborting\n")
-        return
 
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython", name)
     obj.Label = name
-    _FenceReinforcePostPost(obj)
+    FenceReinforcePost(obj)
 
     if FreeCAD.GuiUp:
-        _ViewProviderFencePost(obj.ViewObject)
+        ViewProviderFencePost(obj.ViewObject)
 
     obj.Length = length
     obj.Diameter = diameter
@@ -66,7 +54,7 @@ def makeFenceReinforcePost(diameter=48, length=3000, placement=None, name="Post"
     return obj
 
 
-class _FencePost(ArchComponent.Component):
+class FencePost(ArchComponent.Component):
     def __init__(self, obj):
         ArchComponent.Component.__init__(self, obj)
         self.setProperties(obj)
@@ -80,10 +68,10 @@ class _FencePost(ArchComponent.Component):
             obj.addProperty("App::PropertyLength", "Diameter", "Pipe",
                             QT_TRANSLATE_NOOP("App::Property", "The diameter of this pipe, if not based on a profile")
                             ).Diameter = 48
-        if not "Thickness" in pl:
+        '''if not "Thickness" in pl:
             obj.addProperty("App::PropertyLength", "Thickness", "Pipe",
                             QT_TRANSLATE_NOOP("App::Property", "The Thickness of this pipe, if not based on a profile")
-                            ).Thickness = 4
+                            ).Thickness = 4'''
         if not "Length" in pl:
             obj.addProperty("App::PropertyLength", "Length", "Pipe",
                             QT_TRANSLATE_NOOP("App::Property", "The length of this pipe, if not based on an edge")
@@ -94,86 +82,49 @@ class _FencePost(ArchComponent.Component):
         ArchComponent.Component.onDocumentRestored(self, obj)
         self.setProperties(obj)
 
+    def get_axis(self, obj, lip_heigth):
+        wire = Part.makeLine(FreeCAD.Vector(0, 0, 0), FreeCAD.Vector(0, 0, obj.Length.Value - lip_heigth))
+        #wire = Part.makePolygon(FreeCAD.Vector(0, 0, obj.Length.Value - lip_heigth),)
+        return Part.Wire(wire)
+
     def execute(self, obj):
-        import Part
         pl = obj.Placement
 
-        if obj.CloneOf:
-            obj.Shape = obj.CloneOf.Shape
-        else:
-            w = self.getProfile(obj)
-            try:
-                # sh = w.makePipeShell([p], True, False, 2)
-                sh = w.revolve(FreeCAD.Vector(0.0, 0.0, 0.0), FreeCAD.Vector(0.0, 0.0, 1.0), 360)
-                sh = Part.Solid(sh)
-            except:
-                FreeCAD.Console.PrintError("Unable to build the pipe \n")
-            else:
-                obj.Shape = sh
-        obj.Placement = pl
+        lip_heigth = 20
+        radius = obj.Diameter.Value / 2
 
+        # para que sea una función que sirva para los postes rectos y con curva:
+        axis = self.get_axis(obj, lip_heigth)
+        profile = Part.Wire([Part.Circle(FreeCAD.Vector(0,0,0), FreeCAD.Vector(0,0,1), radius).toShape()])
+        post = axis.makePipeShell([profile, ],True,True,2)
+
+        lip = Part.makeCylinder(radius + 2, lip_heigth)
+        lip = lip.makeFillet(5, [lip.Edges[0]])
+
+        # Obtener caras
+        face_post = post.Faces[2]  # Cara superior del cilindro largo
+        face_lip = lip.Faces[2]  # Cara inferior del cilindro corto
+
+        # Calcular centro y normal de las caras
+        face_post_center = face_post.CenterOfMass
+        face_post_normal = face_post.normalAt(0, 0)
+        face_lip_center = face_lip.CenterOfMass
+        face_lip_normal = face_lip.normalAt(0, 0)
+
+        # Calcular rotación para alinear normales (ajustar dirección)
+        rotacion = FreeCAD.Rotation(face_lip_normal, -face_post_normal)  # Invertir normal del cilindro corto
+        lip.Placement.Rotation = rotacion.multiply(lip.Placement.Rotation)
+
+        # Calcular traslación: mover centro del cilindro corto al centro del cilindro largo
+        traslacion = face_post_center - rotacion.multVec(face_lip_center)
+        lip.Placement.Base = traslacion #face_post_center
+
+        obj.Shape = post.fuse(lip)
+        obj.Placement = pl
         return
 
-        #       -------------------------  Prueba para apoyos de refuerzo:
-        import math
-        L = math.pi / 2 * (obj.Diameter.Value - 2 * obj.Thickness.Value)
 
-        v1 = FreeCAD.Vector(L / 2, 0, obj.Thickness.Value)
-        vc1 = FreeCAD.Vector(L / 2 + obj.Thickness.Value, 0, 0)
-        v2 = FreeCAD.Vector(L / 2, 0, -obj.Thickness.Value)
-
-        v11 = FreeCAD.Vector(-L / 2, 0, obj.Thickness.Value)
-        vc11 = FreeCAD.Vector(-(L / 2 + obj.Thickness.Value), 0, 0)
-        v21 = FreeCAD.Vector(-L / 2, 0, -obj.Thickness.Value)
-
-        arc1 = Part.Arc(v1, vc1, v2).toShape()
-        arc11 = Part.Arc(v11, vc11, v21).toShape()
-        line1 = Part.LineSegment(v11, v1).toShape()
-        line2 = Part.LineSegment(v21, v2).toShape()
-        w = Part.Wire([arc1, line2, arc11, line1])
-        face = Part.Face(w)
-        pro = face.extrude(FreeCAD.Vector(0, 40, 0))
-
-        #Part.Circle(Center, Normal, Radius)
-        cir1 = Part.Face(Part.Wire(Part.Circle(FreeCAD.Vector(0, -200, 0), FreeCAD.Vector(0, 1, 0), obj.Diameter.Value / 2).toShape()))
-        ext = cir1.extrude(FreeCAD.Vector(0, 170, 0))
-        cir2 = Part.Circle(FreeCAD.Vector(0, -30, 0), FreeCAD.Vector(0, 1, 0), obj.Diameter.Value/2).toShape()
-        loft = Part.makeLoft([cir2, w], True)
-        ext = ext.fuse([loft, pro])
-        Part.show(ext)
-
-
-    def getProfile(self, obj):
-        import Part
-        sin45 = 0.707106781
-        radio = obj.Diameter.Value / 2
-        taph = 20
-        tapw = radio + 2
-        chamfer = 5
-        chamfer2 = chamfer * sin45
-
-        edge1 = Part.makeLine(FreeCAD.Vector(0, 0, 0), FreeCAD.Vector(radio, 0, 0))
-        edge2 = Part.makeLine(FreeCAD.Vector(radio, 0, 0), FreeCAD.Vector(radio, 0, obj.Length.Value - taph))
-        edge3 = Part.makeLine(FreeCAD.Vector(radio, 0, obj.Length.Value - taph),
-                              FreeCAD.Vector(tapw, 0, obj.Length.Value - taph))
-        edge4 = Part.makeLine(FreeCAD.Vector(tapw, 0, obj.Length.Value - taph),
-                              FreeCAD.Vector(tapw, 0, obj.Length.Value - chamfer))
-        if True:
-            edge5 = Part.makeLine(FreeCAD.Vector(tapw, 0, obj.Length.Value - chamfer),
-                                  FreeCAD.Vector(tapw - chamfer, 0, obj.Length.Value))
-        else:
-            edge5 = Part.Arc(FreeCAD.Vector(tapw, 0, obj.Length.Value - chamfer),
-                             FreeCAD.Vector(tapw - chamfer2, 0, obj.Length.Value - chamfer2),
-                             FreeCAD.Vector(tapw - chamfer, 0, obj.Length.Value)
-                             ).toShape()
-        edge6 = Part.makeLine(FreeCAD.Vector(tapw - chamfer, 0, obj.Length.Value),
-                              FreeCAD.Vector(0, 0, obj.Length.Value))
-        w = Part.Wire([edge1, edge2, edge3, edge4, edge5, edge6])
-
-        return w
-
-
-class _FenceReinforcePost(ArchComponent.Component):
+class FenceReinforcePost(ArchComponent.Component):
     def __init__(self, obj):
         ArchComponent.Component.__init__(self, obj)
         self.setProperties(obj)
@@ -199,10 +150,18 @@ class _FenceReinforcePost(ArchComponent.Component):
         self.setProperties(obj)
 
     def execute(self, obj):
-
         pl = obj.Placement
-        w = self.getWire(obj)
 
+        lip_heigth = 20
+        post = Part.makeCylinder(obj.Diameter.Value / 2, obj.Length.Value - lip_heigth)
+        lip = Part.makeCylinder(obj.Diameter.Value / 2 + 2, lip_heigth)
+        lip = lip.makeFillet(5, [lip.Edges[0]])
+        lip.translate(FreeCAD.Vector(0, 0, obj.Length.Value - lip_heigth))
+        obj.Shape = post.fuse(lip)
+        obj.Placement = pl
+        return
+
+        w = self.getWire(obj)
         try:
             # sh = w.makePipeShell([p], True, False, 2)
             sh = w.revolve(FreeCAD.Vector(0.0, 0.0, 0.0), FreeCAD.Vector(0.0, 0.0, 1.0), 360)
@@ -244,7 +203,7 @@ class _FenceReinforcePost(ArchComponent.Component):
         return w
 
 
-class _ViewProviderFencePost(ArchComponent.ViewProviderComponent):
+class ViewProviderFencePost(ArchComponent.ViewProviderComponent):
     "A View Provider for the Pipe object"
 
     def __init__(self, vobj):
@@ -254,7 +213,7 @@ class _ViewProviderFencePost(ArchComponent.ViewProviderComponent):
         return ":/icons/Arch_Pipe_Tree.svg"
 
 
-class _CommandFencePost:
+class CommandFencePost:
     "the Arch Pipe command definition"
 
     def GetResources(self):
@@ -269,17 +228,5 @@ class _CommandFencePost:
         return not FreeCAD.ActiveDocument is None
 
     def Activated(self):
-        if True:
-            makeFencePost()
-        else:
-            FreeCAD.ActiveDocument.openTransaction(translate("Arch", "Create Pipe"))
-            FreeCADGui.addModule("Arch")
-            FreeCADGui.doCommand("obj = Arch.makePipe()")
-            FreeCADGui.addModule("Draft")
-            FreeCADGui.doCommand("Draft.autogroup(obj)")
-            FreeCAD.ActiveDocument.commitTransaction()
+        makeFencePost()
         FreeCAD.ActiveDocument.recompute()
-
-
-if FreeCAD.GuiUp:
-    FreeCADGui.addCommand('FencePost', _CommandFencePost())

Electrical/PowerConverter/PowerConverter.py

@@ -0,0 +1,397 @@
+# /**********************************************************************
+# *                                                                     *
+# * Copyright (c) 2021 Javier Braña <javier.branagutierrez@gmail.com>  *
+# *                                                                     *
+# * This program is free software; you can redistribute it and/or modify*
+# * it under the terms of the GNU Lesser General Public License (LGPL)  *
+# * as published by the Free Software Foundation; either version 2 of   *
+# * the License, or (at your option) any later version.                 *
+# * for detail see the LICENCE text file.                               *
+# *                                                                     *
+# * This program is distributed in the hope that it will be useful,     *
+# * but WITHOUT ANY WARRANTY; without even the implied warranty of      *
+# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       *
+# * GNU Library General Public License for more details.                *
+# *                                                                     *
+# * You should have received a copy of the GNU Library General Public   *
+# * License along with this program; if not, write to the Free Software *
+# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307*
+# * USA                                                                 *
+# *                                                                     *
+# ***********************************************************************
+
+import FreeCAD
+import ArchComponent
+import os
+import zipfile
+import re
+
+if FreeCAD.GuiUp:
+    import FreeCADGui
+    from DraftTools import translate
+else:
+    # \cond
+    def translate(ctxt,txt):
+        return txt
+    def QT_TRANSLATE_NOOP(ctxt,txt):
+        return txt
+    # \endcond
+
+import os
+from PVPlantResources import DirIcons as DirIcons
+
+__title__ = "PVPlant Areas"
+__author__ = "Javier Braña"
+__url__ = "http://www.sogos-solar.com"
+
+import PVPlantResources
+from PVPlantResources import DirIcons as DirIcons
+Dir3dObjects = os.path.join(PVPlantResources.DirResources, "3dObjects")
+
+
+def makePCS():
+    obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython", "StringInverter")
+    PowerConverter(obj)
+    ViewProviderStringInverter(obj.ViewObject)
+
+    try:
+        folder = FreeCAD.ActiveDocument.StringInverters
+    except:
+        folder = FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroup", 'StringInverters')
+        folder.Label = "StringInverters"
+    folder.addObject(obj)
+    return obj
+
+
+class PowerConverter(ArchComponent.Component):
+    def __init__(self, obj):
+        ''' Initialize the Area object '''
+        ArchComponent.Component.__init__(self, obj)
+
+        self.oldMPPTs = 0
+
+        self.Type = None
+        self.obj = None
+        self.setProperties(obj)
+
+    def setProperties(self, obj):
+        pl = obj.PropertiesList
+
+        if not "File" in pl:
+            obj.addProperty("App::PropertyFile",
+                            "File",
+                            "Inverter",
+                            "The base file this component is built upon")
+
+        if not ("MPPTs" in pl):
+            obj.addProperty("App::PropertyQuantity",
+                            "MPPTs",
+                            "Inverter",
+                            "Points that define the area"
+                            ).MPPTs = 0
+
+        if not ("Generator" in pl):
+            obj.addProperty("App::PropertyEnumeration",
+                            "Generator",
+                            "Inverter",
+                            "Points that define the area"
+                            ).Generator = ["Generic", "Library"]
+            obj.Generator = "Generic"
+
+        if not ("Type" in pl):
+            obj.addProperty("App::PropertyString",
+                            "Type",
+                            "Base",
+                            "Points that define the area"
+                            ).Type = "PowerConverter"
+            obj.setEditorMode("Type", 1)
+
+        self.Type = obj.Type
+        obj.Proxy = self
+
+    def onDocumentRestored(self, obj):
+        """ Method run when the document is restored """
+        self.setProperties(obj)
+
+    def onBeforeChange(self, obj, prop):
+
+        if prop == "MPPTs":
+            self.oldMPPTs = int(obj.MPPTs)
+
+    def onChanged(self, obj, prop):
+        ''' '''
+
+        if prop == "Generator":
+            if obj.Generator == "Generic":
+                obj.setEditorMode("MPPTs", 0)
+            else:
+                obj.setEditorMode("MPPTs", 1)
+
+        if prop == "MPPTs":
+            ''' '''
+            if self.oldMPPTs > obj.MPPTs:
+                ''' borrar sobrantes '''
+                obj.removeProperty()
+
+            elif self.oldMPPTs < obj.MPPTs:
+                ''' crear los faltantes '''
+                for i in range(self.oldMPPTs, int(obj.MPPTs)):
+                    ''' '''
+                    print(i)
+            else:
+                pass
+
+        if (prop == "File") and obj.File:
+            ''' '''
+
+    def execute(self, obj):
+        ''' '''
+        # obj.Shape: compound
+        # |- body: compound
+        # |-- inverter: solid
+        # |-- door: solid
+        # |-- holder: solid
+
+        # |- connectors: compound
+        # |-- DC: compound
+        # |--- MPPT 1..x: compound
+        # |---- positive: compound
+        # |----- connector 1..y: ??
+        # |---- negative 1..y: compound
+        # |----- connector 1..y: ??
+        # |-- AC: compound
+        # |--- R,S,T,: ??
+        # |-- Communication
+
+        pl = obj.Placement
+        filename = self.getFile(obj)
+        if filename:
+            parts = self.getPartsList(obj)
+            if parts:
+                zdoc = zipfile.ZipFile(filename)
+                if zdoc:
+                    f = zdoc.open(parts[list(parts.keys())[-1]][1])
+                    shapedata = f.read()
+                    f.close()
+                    shapedata = shapedata.decode("utf8")
+                    shape = self.cleanShape(shapedata, obj, parts[list(parts.keys())[-1]][2])
+                    obj.Shape = shape
+                    if not pl.isIdentity():
+                        obj.Placement = pl
+                    obj.MPPTs = len(shape.SubShapes[1].SubShapes[0].SubShapes)
+
+    def cleanShape(self, shapedata, obj, materials):
+        "cleans the imported shape"
+
+        import Part
+        shape = Part.Shape()
+        shape.importBrepFromString(shapedata)
+        '''if obj.FuseArch and materials:
+            # separate lone edges
+            shapes = []
+            for edge in shape.Edges:
+                found = False
+                for solid in shape.Solids:
+                    for soledge in solid.Edges:
+                        if edge.hashCode() == soledge.hashCode():
+                            found = True
+                            break
+                    if found:
+                        break
+                if found:
+                    break
+            else:
+                shapes.append(edge)
+            print("solids:",len(shape.Solids),"mattable:",materials)
+            for key,solindexes in materials.items():
+                if key == "Undefined":
+                    # do not join objects with no defined material
+                    for solindex in [int(i) for i in solindexes.split(",")]:
+                        shapes.append(shape.Solids[solindex])
+                else:
+                    fusion = None
+                    for solindex in [int(i) for i in solindexes.split(",")]:
+                        if not fusion:
+                            fusion = shape.Solids[solindex]
+                        else:
+                            fusion = fusion.fuse(shape.Solids[solindex])
+                    if fusion:
+                        shapes.append(fusion)
+            shape = Part.makeCompound(shapes)
+            try:
+                shape = shape.removeSplitter()
+            except Exception:
+                print(obj.Label,": error removing splitter")'''
+        return shape
+
+    def getFile(self, obj, filename=None):
+        "gets a valid file, if possible"
+
+        if not filename:
+            filename = obj.File
+        if not filename:
+            return None
+        if not filename.lower().endswith(".fcstd"):
+            return None
+        if not os.path.exists(filename):
+            # search for the file in the current directory if not found
+            basename = os.path.basename(filename)
+            currentdir = os.path.dirname(obj.Document.FileName)
+            altfile = os.path.join(currentdir,basename)
+            if altfile == obj.Document.FileName:
+                return None
+            elif os.path.exists(altfile):
+                return altfile
+            else:
+                # search for subpaths in current folder
+                altfile = None
+                subdirs = self.splitall(os.path.dirname(filename))
+                for i in range(len(subdirs)):
+                    subpath = [currentdir]+subdirs[-i:]+[basename]
+                    altfile = os.path.join(*subpath)
+                    if os.path.exists(altfile):
+                        return altfile
+                return None
+        return filename
+
+    def getPartsList(self, obj, filename=None):
+
+        "returns a list of Part-based objects in a FCStd file"
+
+        parts = {}
+        materials = {}
+        filename = self.getFile(obj,filename)
+        if not filename:
+            return parts
+        zdoc = zipfile.ZipFile(filename)
+        with zdoc.open("Document.xml") as docf:
+            name = None
+            label = None
+            part = None
+            materials = {}
+            writemode = False
+            for line in docf:
+                line = line.decode("utf8")
+                if "<Object name=" in line:
+                    n = re.findall('name=\"(.*?)\"',line)
+                    if n:
+                        name = n[0]
+                elif "<Property name=\"Label\"" in line:
+                    writemode = True
+                elif writemode and "<String value=" in line:
+                    n = re.findall('value=\"(.*?)\"',line)
+                    if n:
+                        label = n[0]
+                        writemode = False
+                elif "<Property name=\"Shape\" type=\"Part::PropertyPartShape\"" in line:
+                    writemode = True
+                elif writemode and "<Part file=" in line:
+                    n = re.findall('file=\"(.*?)\"',line)
+                    if n:
+                        part = n[0]
+                        writemode = False
+                elif "<Property name=\"MaterialsTable\" type=\"App::PropertyMap\"" in line:
+                    writemode = True
+                elif writemode and "<Item key=" in line:
+                    n = re.findall('key=\"(.*?)\"',line)
+                    v = re.findall('value=\"(.*?)\"',line)
+                    if n and v:
+                        materials[n[0]] = v[0]
+                elif writemode and "</Map>" in line:
+                    writemode = False
+                elif "</Object>" in line:
+                    if name and label and part:
+                        parts[name] = [label,part,materials]
+                    name = None
+                    label = None
+                    part = None
+                    materials = {}
+                    writemode = False
+        return parts
+
+    def getColors(self,obj):
+
+        "returns the DiffuseColor of the referenced object"
+
+        filename = self.getFile(obj)
+        if not filename:
+            return None
+        part = obj.Part
+        if not obj.Part:
+            return None
+        zdoc = zipfile.ZipFile(filename)
+        if not "GuiDocument.xml" in zdoc.namelist():
+            return None
+        colorfile = None
+        with zdoc.open("GuiDocument.xml") as docf:
+            writemode1 = False
+            writemode2 = False
+            for line in docf:
+                line = line.decode("utf8")
+                if ("<ViewProvider name=" in line) and (part in line):
+                    writemode1 = True
+                elif writemode1 and ("<Property name=\"DiffuseColor\"" in line):
+                    writemode1 = False
+                    writemode2 = True
+                elif writemode2 and ("<ColorList file=" in line):
+                    n = re.findall('file=\"(.*?)\"',line)
+                    if n:
+                        colorfile = n[0]
+                        break
+        if not colorfile:
+            return None
+        if not colorfile in zdoc.namelist():
+            return None
+        colors = []
+        cf = zdoc.open(colorfile)
+        buf = cf.read()
+        cf.close()
+        for i in range(1,int(len(buf)/4)):
+            colors.append((buf[i*4+3]/255.0,buf[i*4+2]/255.0,buf[i*4+1]/255.0,buf[i*4]/255.0))
+        if colors:
+            return colors
+        return None
+
+    def splitall(self,path):
+
+        "splits a path between its components"
+
+        allparts = []
+        while 1:
+            parts = os.path.split(path)
+            if parts[0] == path:  # sentinel for absolute paths
+                allparts.insert(0, parts[0])
+                break
+            elif parts[1] == path: # sentinel for relative paths
+                allparts.insert(0, parts[1])
+                break
+            else:
+                path = parts[0]
+                allparts.insert(0, parts[1])
+        return allparts
+
+class ViewProviderStringInverter(ArchComponent.ViewProviderComponent):
+    def __init__(self, vobj):
+        ArchComponent.ViewProviderComponent.__init__(self, vobj)
+
+    def getIcon(self):
+        return str(os.path.join(PVPlantResources.DirIcons, "Inverter.svg"))
+
+class CommandPowerConverter:
+
+    def GetResources(self):
+        return {'Pixmap': str(os.path.join(PVPlantResources.DirIcons, "Inverter.svg")),
+                'Accel': "E, I",
+                'MenuText': "String Inverter",
+                'ToolTip': "String Placement",}
+
+    def Activated(self):
+        sinverter = makeStringInverter()
+
+    def IsActive(self):
+        active = not (FreeCAD.ActiveDocument is None)
+        return active
+
+if FreeCAD.GuiUp:
+    FreeCADGui.addCommand('PowerConverter', CommandPowerConverter())
+

Electrical/group.py

@@ -0,0 +1,387 @@
+def groupTrackersToTransformers(transformer_power, max_distance):
+    import numpy as np
+    from scipy.spatial import KDTree
+    import FreeCAD
+    from collections import deque
+
+    # 1. Obtener todos los trackers válidos
+    valid_trackers = []
+    valid_points = []
+    valid_power = []
+
+    for tracker in FreeCAD.ActiveDocument.Objects:
+        if hasattr(tracker, 'Proxy') and (tracker.Proxy.Type == "Tracker"):
+            base = tracker.Placement.Base
+            if all(np.isfinite([base.x, base.y, base.z])):
+                valid_trackers.append(tracker)
+                valid_points.append([base.x, base.y])
+                valid_power.append(tracker.Setup.TotalPower)
+
+    if not valid_trackers:
+        FreeCAD.Console.PrintWarning("No se encontraron trackers válidos para agrupar\n")
+        return
+
+    # 2. Obtener parámetros de los CTs
+    target_power = transformer_power * 1.2
+    points = np.array(valid_points)
+    power_values = np.array(valid_power)
+
+    # 3. Determinar dirección de barrido (oeste a este por defecto)
+    min_x, min_y = np.min(points, axis=0)
+    max_x, max_y = np.max(points, axis=0)
+
+    # 4. Ordenar trackers de oeste a este (menor X a mayor X)
+    '''
+    Norte a Sur: sorted_indices = np.argsort(-points[:, 1]) (Y descendente)
+    Sur a Norte: sorted_indices = np.argsort(points[:, 1]) (Y ascendente)
+    Este a Oeste: sorted_indices = np.argsort(-points[:, 0]) (X descendente)
+    '''
+    sorted_indices = np.argsort(points[:, 0])
+    sorted_points = points[sorted_indices]
+    sorted_power = power_values[sorted_indices]
+    sorted_trackers = [valid_trackers[i] for i in sorted_indices]
+
+    # 5. Crear KDTree para búsquedas rápidas
+    kdtree = KDTree(sorted_points)
+
+    # 6. Algoritmo de barrido espacial
+    transformer_groups = []
+    used_indices = set()
+
+    # Función para expandir un grupo desde un punto inicial
+    def expand_group(start_idx):
+        group = []
+        total_power = 0
+        queue = deque([start_idx])
+
+        while queue and total_power < target_power:
+            idx = queue.popleft()
+            if idx in used_indices:
+                continue
+
+            # Añadir tracker al grupo si no excede la potencia
+            tracker_power = sorted_power[idx]
+            if total_power + tracker_power > target_power * 1.05:
+                continue
+
+            group.append(sorted_trackers[idx])
+            total_power += tracker_power
+            used_indices.add(idx)
+
+            # Buscar vecinos cercanos
+            neighbors = kdtree.query_ball_point(
+                sorted_points[idx],
+                max_distance
+            )
+
+            # Filtrar vecinos no usados y ordenar por proximidad al punto inicial
+            neighbors = [n for n in neighbors if n not in used_indices]
+            neighbors.sort(key=lambda n: abs(n - start_idx))
+            queue.extend(neighbors)
+
+        return group, total_power
+
+    # 7. Barrido principal de oeste a este
+    for i in range(len(sorted_points)):
+        if i in used_indices:
+            continue
+
+        group, total_power = expand_group(i)
+
+        if group:
+            # Calcular centro del grupo
+            group_points = np.array([t.Placement.Base[:2] for t in group])
+            center = np.mean(group_points, axis=0)
+
+            transformer_groups.append({
+                'trackers': group,
+                'total_power': total_power,
+                'center': center
+            })
+
+    # 8. Manejar grupos residuales (si los hay)
+    unused_indices = set(range(len(sorted_points))) - used_indices
+    if unused_indices:
+        # Intentar añadir trackers residuales a grupos existentes
+        for idx in unused_indices:
+            point = sorted_points[idx]
+            tracker_power = sorted_power[idx]
+
+            # Buscar el grupo más cercano que pueda aceptar este tracker
+            best_group = None
+            min_distance = float('inf')
+
+            for group in transformer_groups:
+                if group['total_power'] + tracker_power <= target_power * 1.05:
+                    dist = np.linalg.norm(point - group['center'])
+                    if dist < min_distance and dist < max_distance * 1.5:
+                        min_distance = dist
+                        best_group = group
+
+            # Añadir al grupo si se encontró uno adecuado
+            if best_group:
+                best_group['trackers'].append(sorted_trackers[idx])
+                best_group['total_power'] += tracker_power
+                # Actualizar centro del grupo
+                group_points = np.array([t.Placement.Base[:2] for t in best_group['trackers']])
+                best_group['center'] = np.mean(group_points, axis=0)
+            else:
+                # Crear un nuevo grupo con este tracker residual
+                group = [sorted_trackers[idx]]
+                center = point
+                transformer_groups.append({
+                    'trackers': group,
+                    'total_power': tracker_power,
+                    'center': center
+                })
+
+    # 9. Crear los grupos en FreeCAD
+    transformer_group = FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroup", "Transformers")
+    transformer_group.Label = "Centros de Transformación"
+
+    for i, group in enumerate(transformer_groups):
+        # Crear la esfera que representará el CT
+        ct_sphere = FreeCAD.ActiveDocument.addObject("Part::Sphere", f"CT_{i + 1}")
+        ct_sphere.Radius = 5000  # 2m de radio
+        ct_sphere.Placement.Base = FreeCAD.Vector(group['center'][0], group['center'][1], 0)
+
+        # Añadir propiedades personalizadas
+        ct_sphere.addProperty("App::PropertyLinkList", "Trackers", "CT",
+                              "Lista de trackers asociados a este CT")
+        ct_sphere.addProperty("App::PropertyFloat", "TotalPower", "CT",
+                              "Potencia total del grupo (W)")
+        ct_sphere.addProperty("App::PropertyFloat", "NominalPower", "CT",
+                              "Potencia nominal del transformador (W)")
+        ct_sphere.addProperty("App::PropertyFloat", "Utilization", "CT",
+                              "Porcentaje de utilización (Total/Nominal)")
+
+        # Establecer valores de las propiedades
+        ct_sphere.Trackers = group['trackers']
+        ct_sphere.TotalPower = group['total_power'].Value
+        ct_sphere.NominalPower = transformer_power
+        ct_sphere.Utilization = (group['total_power'].Value / transformer_power) * 100
+
+        # Configurar visualización
+        # Calcular color basado en utilización (verde < 100%, amarillo < 110%, rojo > 110%)
+        utilization = ct_sphere.Utilization
+        if utilization <= 100:
+            color = (0.0, 1.0, 0.0)  # Verde
+        elif utilization <= 110:
+            color = (1.0, 1.0, 0.0)  # Amarillo
+        else:
+            color = (1.0, 0.0, 0.0)  # Rojo
+
+        ct_sphere.ViewObject.ShapeColor = color
+        ct_sphere.ViewObject.Transparency = 40  # 40% de transparencia
+
+        # Añadir etiqueta con información
+        ct_sphere.ViewObject.DisplayMode = "Shaded"
+        ct_sphere.Label = f"CT {i + 1} ({ct_sphere.TotalPower / 1000:.1f}kW/{ct_sphere.NominalPower / 1000:.1f}kW)"
+
+        # Añadir al grupo principal
+        transformer_group.addObject(ct_sphere)
+
+    FreeCAD.Console.PrintMessage(f"Se crearon {len(transformer_groups)} centros de transformación\n")
+    onSelectGatePoint()
+
+
+import FreeCAD, FreeCADGui, Part
+import numpy as np
+from scipy.stats import linregress
+from PySide import QtGui
+
+class InternalPathCreator:
+    def __init__(self, gate_point, strategy=1, path_width=4000):
+        self.gate_point = gate_point
+        self.strategy = strategy
+        self.path_width = path_width
+        self.ct_spheres = []
+        self.ct_positions = []
+
+    def get_transformers(self):
+        transformers_group = FreeCAD.ActiveDocument.getObject("Transformers")
+        if not transformers_group:
+            FreeCAD.Console.PrintError("No se encontró el grupo 'Transformers'\n")
+            return False
+
+        self.ct_spheres = transformers_group.Group
+        if not self.ct_spheres:
+            FreeCAD.Console.PrintWarning("No hay Centros de Transformación en el grupo\n")
+            return False
+
+        # Obtener las posiciones de los CTs
+        for sphere in self.ct_spheres:
+            base = sphere.Placement.Base
+            self.ct_positions.append(FreeCAD.Vector(base.x, base.y, 0))
+        return True
+
+    def create_paths(self):
+        if not self.get_transformers():
+            return []
+
+        if self.strategy == 1:
+            return self.create_direct_paths()
+        elif self.strategy == 2:
+            return self.create_unified_path()
+        else:
+            FreeCAD.Console.PrintError("Estrategia no válida. Use 1 o 2.\n")
+            return []
+
+    def create_direct_paths(self):
+        """Estrategia 1: Caminos independientes desde cada CT hasta la puerta"""
+        paths = []
+        for ct in self.ct_positions:
+            paths.append([ct, self.gate_point])
+        return paths
+
+    def create_unified_path(self):
+        """Estrategia 2: Único camino que une todos los CTs y la puerta usando regresión lineal"""
+        if not self.ct_positions:
+            return []
+
+        all_points = self.ct_positions + [self.gate_point]
+        x = [p.x for p in all_points]
+        y = [p.y for p in all_points]
+
+        # Manejar caso de puntos alineados verticalmente
+        if np.std(x) < 1e-6:
+            sorted_points = sorted(all_points, key=lambda p: p.y)
+            paths = []
+            for i in range(len(sorted_points) - 1):
+                paths.append([sorted_points[i], sorted_points[i + 1]])
+            return paths
+
+        # Calcular regresión lineal
+        slope, intercept, _, _, _ = linregress(x, y)
+
+        # Función para proyectar puntos
+        def project_point(point):
+            x0, y0 = point.x, point.y
+            if abs(slope) > 1e6:
+                return FreeCAD.Vector(x0, intercept, 0)
+            x_proj = (x0 + slope * (y0 - intercept)) / (1 + slope ** 2)
+            y_proj = slope * x_proj + intercept
+            return FreeCAD.Vector(x_proj, y_proj, 0)
+
+        projected_points = [project_point(p) for p in all_points]
+
+        # Calcular distancias a lo largo de la línea
+        ref_point = projected_points[0]
+        direction_vector = FreeCAD.Vector(1, slope).normalize()
+        distances = []
+        for p in projected_points:
+            vec_to_point = p - ref_point
+            distance = vec_to_point.dot(direction_vector)
+            distances.append(distance)
+
+        # Ordenar por distancia
+        sorted_indices = np.argsort(distances)
+        sorted_points = [all_points[i] for i in sorted_indices]
+
+        # Crear caminos
+        paths = []
+        for i in range(len(sorted_points) - 1):
+            paths.append([sorted_points[i], sorted_points[i + 1]])
+        return paths
+
+    def create_3d_path(self, path_poly):
+        """Crea geometría 3D para el camino adaptada a orientación norte-sur"""
+        segments = []
+        for i in range(len(path_poly.Vertexes) - 1):
+            start = path_poly.Vertexes[i].Point
+            end = path_poly.Vertexes[i + 1].Point
+            direction = end - start
+
+            # Determinar orientación predominante
+            if abs(direction.x) > abs(direction.y):
+                normal = FreeCAD.Vector(0, 1, 0)  # Norte-sur
+            else:
+                normal = FreeCAD.Vector(1, 0, 0)  # Este-oeste
+
+            offset = normal * self.path_width / 2
+
+            # Crear puntos para la sección transversal
+            p1 = start + offset
+            p2 = start - offset
+            p3 = end - offset
+            p4 = end + offset
+
+            # Crear cara
+            wire = Part.makePolygon([p1, p2, p3, p4, p1])
+            face = Part.Face(wire)
+            segments.append(face)
+
+        if segments:
+            '''road_shape = segments[0].fuse(segments[1:])
+            return road_shape.removeSplitter()'''
+            return Part.makeCompound(segments)
+        return Part.Shape()
+
+    def build(self):
+        paths = self.create_paths()
+        if not paths:
+            return
+
+        path_group = FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroup", "InternalPaths")
+        path_group.Label = f"Caminos Internos (Estrategia {self.strategy})"
+
+        for i, path in enumerate(paths):
+            poly = Part.makePolygon(path)
+
+            # Objeto para la línea central
+            path_obj = FreeCAD.ActiveDocument.addObject("Part::Feature", f"Path_{i + 1}")
+            path_obj.Shape = poly
+            path_obj.ViewObject.LineWidth = 3.0
+            path_obj.ViewObject.LineColor = (0.0, 0.0, 1.0)
+
+            # Objeto para la superficie 3D
+            road_shape = self.create_3d_path(poly)
+            road_obj = FreeCAD.ActiveDocument.addObject("Part::Feature", f"Road_{i + 1}")
+            road_obj.Shape = road_shape
+            road_obj.ViewObject.ShapeColor = (0.7, 0.7, 0.7)
+
+            path_group.addObject(path_obj)
+            path_group.addObject(road_obj)
+
+        FreeCAD.Console.PrintMessage(f"Se crearon {len(paths)} segmentos de caminos internos\n")
+
+
+# Función para mostrar el diálogo de estrategia
+def show_path_strategy_dialog(gate_point):
+    dialog = QtGui.QDialog()
+    dialog.setWindowTitle("Seleccionar Estrategia de Caminos")
+    layout = QtGui.QVBoxLayout(dialog)
+
+    label = QtGui.QLabel("Seleccione la estrategia para crear los caminos internos:")
+    layout.addWidget(label)
+
+    rb1 = QtGui.QRadioButton("Estrategia 1: Caminos independientes desde cada CT hasta la puerta")
+    rb1.setChecked(True)
+    layout.addWidget(rb1)
+
+    rb2 = QtGui.QRadioButton("Estrategia 2: Único camino que une todos los CTs y la puerta")
+    layout.addWidget(rb2)
+
+    btn_box = QtGui.QDialogButtonBox(QtGui.QDialogButtonBox.Ok | QtGui.QDialogButtonBox.Cancel)
+    layout.addWidget(btn_box)
+
+    def on_accept():
+        strategy = 1 if rb1.isChecked() else 2
+        dialog.accept()
+        creator = InternalPathCreator(gate_point, strategy)
+        creator.build()
+
+    btn_box.accepted.connect(on_accept)
+    btn_box.rejected.connect(dialog.reject)
+
+    dialog.exec_()
+
+
+# Uso: seleccionar un punto para la puerta de entrada
+def onSelectGatePoint():
+    '''gate = FreeCAD.ActiveDocument.findObjects(Name="FenceGate")[0]
+    gate_point = gate.Placement.Base
+    show_path_strategy_dialog(gate_point)'''
+
+    sel = FreeCADGui.Selection.getSelectionEx()[0]
+    show_path_strategy_dialog(sel.SubObjects[0].CenterOfMass)

Export/exportDXF.py

@@ -1,5 +1,6 @@
 import math
 import FreeCAD
+import Part
 from Utils.PVPlantUtils import findObjects
 
 if FreeCAD.GuiUp:
@@ -259,15 +260,60 @@ class exportDXF:
             'rotation': rotation
         })
 
-    def createPolyline(self, wire):
+    def createPolyline(self, wire, layer=""):
         try:
             data = getWire(wire.Shape)
             lwp = self.msp.add_lwpolyline(data)
+            if layer:
+                lwp.dxf.layer = layer
             return lwp
         except Exception as e:
             print("Error creating polyline:", e)
             return None
 
+    def createHatch(self, wire, pattern="SOLID", scale=1.0, angle=0, layer=None):
+        """Crea un sombreado (hatch) para un área"""
+        try:
+            # Obtener los puntos en metros
+            points = [(x, y) for (x, y, *_) in wire]
+
+            # Crear el hatch
+            hatch = self.msp.add_hatch(color=7, dxfattribs={'layer': layer})
+
+            if pattern == "SOLID":
+                # Sombreado sólido
+                hatch.set_solid_fill()
+            else:
+                # Patrón de sombreado
+                hatch.set_pattern_fill(name=pattern, scale=scale, angle=angle)
+
+            # Añadir el contorno
+            hatch.paths.add_polyline_path(points, is_closed=True)
+            return hatch
+        except Exception as e:
+            print("Error creating hatch:", e)
+            return None
+
+    def export_feature_image(self, feature, layer_name):
+        """Exporta una imagen del GeoFeature y la añade al DXF"""
+        try:
+            # Añadir la imagen al DXF
+            image_def = self.doc.add_image_def(feature.ImageFile, size_in_pixel=(feature.XSize, feature.YSize))
+            self.msp.add_image(image_def,
+                               insert=(0, 0, 0),
+                               size_in_units=(feature.XSize,
+                                              feature.YSize),
+                               rotation=0,
+                               dxfattribs={'layer': layer_name})
+
+            print(f"Imagen exportada para {feature.Label}")
+
+            # Eliminar el archivo temporal
+            import os
+            os.unlink(temp_img.name)
+        except Exception as e:
+            print(f"Error en exportación de imagen: {e}")
+
 # =================================================================================
 # INTERFAZ DE USUARIO
 # =================================================================================
@@ -575,6 +621,58 @@ class LineTypeComboBox(QtWidgets.QComboBox):
         finally:
             painter.end()  # Asegurar que el painter se cierre correctamente
 
+layers = [
+    ("Available area", QtGui.QColor(0, 204, 153), "Continuous", "1", True),
+    ("Available area Names", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+
+    ("Areas Exclusion", QtGui.QColor(255, 85, 0), "Continuous", "1", True),
+    ("Areas Exclusion Name", QtGui.QColor(255, 85, 0), "Continuous", "1", True),
+    ("Areas Cadastral Plot", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("Areas Cadastral Plot Name", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("Areas Offset", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+
+    ("Cable codes LV AC inverter", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("Cable codes LV string", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("Cable codes MV System", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("CABLES LV AC inverter 120 mm2", QtGui.QColor(255, 204, 0), "Continuous", "1", True),
+    ("CABLES LV AC inverter 185 mm2", QtGui.QColor(204, 153, 0), "Continuous", "1", True),
+    ("CABLES LV string 4 mm2", QtGui.QColor(255, 255, 0), "Continuous", "1", True),
+    ("CABLES LV string 10 mm2", QtGui.QColor(255, 255, 102), "Continuous", "1", True),
+    ("CABLES MV system 300 mm2", QtGui.QColor(102, 51, 0), "Continuous", "1", True),
+
+    ("CIVIL Fence", QtGui.QColor(102, 102, 102), "FENCELINE1", "1", True),
+    ("CIVIL External Roads", QtGui.QColor(91, 91, 91), "Continuous", "1", True),
+    ("CIVIL External Roads Axis", QtGui.QColor(255, 255, 192), "Dashed", "1", True),
+    ("CIVIL External Roads Text", QtGui.QColor(255, 255, 192), "Continuous", "1", True),
+    ("CIVIL Internal Roads", QtGui.QColor(153, 95, 76), "Continuous", "1", True),
+    ("CIVIL Internal Roads Axis", QtGui.QColor(192, 192, 192), "Dashed", "1", True),
+    ("CIVIL External Roads Text", QtGui.QColor(192, 192, 192), "Continuous", "1", True),
+
+    ("Contour Line Legend text", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("Major contour line", QtGui.QColor(0, 0, 0), "Continuous", "1", True),
+    ("Major contour value", QtGui.QColor(0, 0, 0), "Continuous", "1", True),
+    ("Minor contour line", QtGui.QColor(128, 128, 128), "Continuous", "1", True),
+    ("Minor contour value", QtGui.QColor(128, 128, 128), "Continuous", "1", True),
+    ("Power Stations", QtGui.QColor(255, 0, 0), "Continuous", "1", True),
+    ("Power Stations Names", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("ST", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("ST Names", QtGui.QColor(255, 255, 0), "Continuous", "1", True),
+    ("String Inv", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("STRUC Structure 1", QtGui.QColor(0, 0, 255), "Continuous", "1", True),
+    ("STRUC Structure 2", QtGui.QColor(0, 0, 204), "Continuous", "1", True),
+    ("STRUC Structure 3", QtGui.QColor(0, 0, 153), "Continuous", "1", True),
+    ("STRUC Structure 4", QtGui.QColor(0, 0, 128), "Continuous", "1", True),
+    ("STRUC Structure 5", QtGui.QColor(0, 0, 102), "Continuous", "1", True),
+    ("STRUC Structure 6", QtGui.QColor(0, 0, 76), "Continuous", "1", True),
+    ("STRUC Structure 7", QtGui.QColor(0, 0, 51), "Continuous", "1", True),
+    ("STRUC Structure 8", QtGui.QColor(0, 0, 25), "Continuous", "1", True),
+    ("Structure Codes", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("TRENCHES Low voltage 400.0 x 1000.0 m", QtGui.QColor(128, 128, 128), "Continuous", "1", True),
+    ("TRENCHES Medium voltage 400.0 x 1000.", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("TRENCHES Medium voltage 800.0 x 1000.", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+    ("TRENCHES Medium voltage 800.0 x 1500.", QtGui.QColor(255, 255, 255), "Continuous", "1", True),
+]
+
 
 class _PVPlantExportDXF(QtGui.QWidget):
     '''The editmode TaskPanel to select what you want to export'''
@@ -610,10 +708,8 @@ class _PVPlantExportDXF(QtGui.QWidget):
             self.form.tableLayers.removeRow(row)
 
         # Configuración de las capas por defecto
-        self.add_row("Areas_Boundary", QtGui.QColor(0, 125, 125), "FENCELINE1", "1", True)
-        self.add_row("Areas_Exclusion", QtGui.QColor(255, 0, 0), "CONTINUOUS", "1", True)
-        self.add_row("Internal_Roads", QtGui.QColor(128, 128, 128), "CONTINUOUS", "1", True)
-        self.add_row("Frames", QtGui.QColor(0, 255, 0), "CONTINUOUS", "1", True)
+        for row in layers:
+            self.add_row(*row)
 
     def save_project_settings(self):
         """Guarda la configuración actual en el proyecto de FreeCAD"""
@@ -778,25 +874,25 @@ class _PVPlantExportDXF(QtGui.QWidget):
                 )
 
     def writeArea(self, exporter):
-        exporter.createPolyline(FreeCAD.ActiveDocument.Site.Boundary, "boundary")
-
-        areas_types = ["Boundaries", "Exclusions", "Offsets"]
+        exporter.createPolyline(FreeCAD.ActiveDocument.Site.Boundary, "Available area")
+        areas_types = [("Boundaries", "Available area"),
+                       ("CadastralPlots", "Areas Cadastral Plot"),
+                       ("Exclusions", "Areas Exclusion"),
+                       ("Offsets", "Areas Offset")]
         for area_type in areas_types:
-            if hasattr(FreeCAD.ActiveDocument, area_type):
-                for area in FreeCAD.ActiveDocument.Boundaries.Group:
-                    exporter.createPolyline(area, "Areas_Boundary")
-
-        '''for area in FreeCAD.ActiveDocument.Boundaries.Group:
-            pol = exporter.createPolyline(area)
-            pol.dxf.layer = "Areas_Boundary"
-
-        for area in FreeCAD.ActiveDocument.Exclusions.Group:
-            pol = exporter.createPolyline(area)
-            pol.dxf.layer = "Areas_Exclusion"
-
-        for area in FreeCAD.ActiveDocument.Offsets.Group:
-            pol = exporter.createPolyline(area)
-            pol.dxf.layer = "Areas_Offsets"'''
+            if hasattr(FreeCAD.ActiveDocument, area_type[0]):
+                area_group = FreeCAD.ActiveDocument.getObjectsByLabel(area_type[0])
+                if len(area_group):
+                    for area in area_group[0].Group:
+                        tmp = exporter.createPolyline(area, area_type[1])
+                        if area_type[0] == "Exclusions":
+                            exporter.createHatch(
+                                tmp,
+                                pattern="ANSI37",
+                                scale=0.3,
+                                angle=0,
+                                layer=area_type[1]
+                            )
 
     def writeFrameSetups(self, exporter):
         if not hasattr(FreeCAD.ActiveDocument, "Site"):
@@ -811,11 +907,11 @@ class _PVPlantExportDXF(QtGui.QWidget):
                 w.Placement.Base = w.Placement.Base.sub(center)
                 block.add_lwpolyline(getWire(w))
 
-                block.add_circle((0, 0), 0.2, dxfattribs={'color': 2})
+                block.add_circle((0, 0), 0.2, dxfattribs={'layer': 'Structure Posts'}) #'color': 2,
                 p = math.sin(math.radians(45)) * 0.2
 
-                block.add_line((-p, -p), (p, p), dxfattribs={"layer": "MyLines"})
-                block.add_line((-p, p), (p, -p), dxfattribs={"layer": "MyLines"})
+                block.add_line((-p, -p), (p, p), dxfattribs={'layer': 'Structure Posts'})
+                block.add_line((-p, p), (p, -p), dxfattribs={'layer': 'Structure Posts'})
 
         # 2. Frames
         for ts in FreeCAD.ActiveDocument.Site.Frames:
@@ -868,10 +964,10 @@ class _PVPlantExportDXF(QtGui.QWidget):
 
         if FreeCAD.ActiveDocument.Transport:
             for road in FreeCAD.ActiveDocument.Transport.Group:
-                base = exporter.createPolyline(road, "External_Roads")
+                base = exporter.createPolyline(road, "CIVIL External Roads")
                 base.dxf.const_width = road.Width
 
-                axis = exporter.createPolyline(road.Base, "External_Roads_Axis")
+                axis = exporter.createPolyline(road, "CIVIL External Roads Axis")
                 axis.dxf.const_width = .2
 
     def writeTrenches(self, exporter):
@@ -976,8 +1072,12 @@ class _PVPlantExportDXF(QtGui.QWidget):
         self.writeTrenches(exporter)
 
         # Crear espacios de papel
-        self.setup_layout4(exporter.doc)
-        self.createPaperSpaces(exporter)
+        #self.setup_layout4(exporter.doc)
+        #self.createPaperSpaces(exporter)
+
+        if hasattr(FreeCAD.ActiveDocument, "Background"):
+            # Exportar como imagen en lugar de polilínea
+            exporter.export_feature_image(FreeCAD.ActiveDocument.Background, "Site_Image")
 
         # Guardar archivo
         exporter.save()

Importer/importOSM.py

@@ -42,11 +42,10 @@ class OSMImporter:
         }
         self.ssl_context = ssl.create_default_context(cafile=certifi.where())
 
-    def transform_from_latlon(self, lat, lon):
-        point = ImportElevation.getElevationFromOE([[lat, lon], ])
-        return FreeCAD.Vector(point[0].x, point[0].y, point[0].z) * scale - self.Origin
-        '''x, y, _, _ = utm.from_latlon(lat, lon)
-        return FreeCAD.Vector(x, y, .0) * scale - self.Origin'''
+    def transform_from_latlon(self, coordinates):
+        points = ImportElevation.getElevationFromOE(coordinates)
+        pts = [FreeCAD.Vector(p.x, p.y, p.z).sub(self.Origin) for p in points]
+        return pts
 
     def get_osm_data(self, bbox):
         query = f"""
@@ -81,11 +80,16 @@ class OSMImporter:
         root = ET.fromstring(osm_data)
 
         # Almacenar nodos transformados
+        coordinates = [[float(node.attrib['lat']), float(node.attrib['lon'])] for node in root.findall('node')]
+        coordinates = self.transform_from_latlon(coordinates)
+        for i, node in enumerate(root.findall('node')):
+            self. nodes[node.attrib['id']] = coordinates[i]
+        '''return
         for node in root.findall('node'):
             self.nodes[node.attrib['id']] = self.transform_from_latlon(
                 float(node.attrib['lat']),
                 float(node.attrib['lon'])
-            )
+            )'''
 
         # Procesar ways
         for way in root.findall('way'):
@@ -162,11 +166,10 @@ class OSMImporter:
     def create_buildings(self):
         building_layer = self.create_layer("Buildings")
         for way_id, data in self.ways_data.items():
+            print(data)
             if 'building' not in data['tags']:
                 continue
 
-            print(data)
-
             tags = data['tags']
             nodes = [self.nodes[ref] for ref in data['nodes'] if ref in self.nodes]
 

PVPlantImportGrid.py

@@ -122,6 +122,7 @@ def getElevationFromOE(coordinates):
     try:
         r = get(query, timeout=20, verify=certifi.where())  # <-- Corrección aquí
     except RequestException as e:
+        print(f"Error en la solicitud: {str(e)}")
         points = []
         for i, point in enumerate(coordinates):
             c = utm.from_latlon(point[0], point[1])

PVPlantPlacement.py

@@ -26,6 +26,7 @@ import Part
 if FreeCAD.GuiUp:
     import FreeCADGui, os
     from PySide import QtCore, QtGui
+    from PySide.QtGui import QListWidgetItem
     from PySide.QtCore import QT_TRANSLATE_NOOP
 else:
     # \cond
@@ -62,7 +63,8 @@ class _PVPlantPlacementTaskPanel:
     '''The editmode TaskPanel for Schedules'''
 
     def __init__(self, obj=None):
-        self.Terrain = PVPlantSite.get().Terrain
+        self.site = PVPlantSite.get()
+        self.Terrain = self.site.Terrain
         self.FrameSetups = None
         self.PVArea = None
         self.Area = None
@@ -76,9 +78,12 @@ class _PVPlantPlacementTaskPanel:
         self.form = FreeCADGui.PySideUic.loadUi(os.path.join(PVPlantResources.__dir__, "PVPlantPlacement.ui"))
         self.form.setWindowIcon(QtGui.QIcon(os.path.join(PVPlantResources.DirIcons, "way.svg")))
 
+        self.addFrames()
+        self.maxWidth = max([frame.Width.Value for frame in self.site.Frames])
+
         self.form.buttonPVArea.clicked.connect(self.addPVArea)
-        self.form.buttonAddFrame.clicked.connect(self.addFrame)
-        self.form.buttonRemoveFrame.clicked.connect(self.removeFrame)
+        self.form.editGapCols.valueChanged.connect(self.update_inner_spacing)
+        self.update_inner_spacing()
 
     def addPVArea(self):
         sel = FreeCADGui.Selection.getSelection()
@@ -86,21 +91,14 @@ class _PVPlantPlacementTaskPanel:
             self.PVArea = sel[0]
             self.form.editPVArea.setText(self.PVArea.Label)
 
-    def addFrame(self):
-        from Mechanical.Frame import PVPlantFrame
-        selection = FreeCADGui.Selection.getSelection()
-        self.FrameSetup = selectionFilter(selection, PVPlantFrame.TrackerSetup)
+    def addFrames(self):
+        for frame_setup in self.site.Frames:
+            list_item = QListWidgetItem(frame_setup.Name, self.form.listFrameSetups)
+            list_item.setCheckState(QtCore.Qt.Checked)
 
-        if len(selection) > 0:
-            items = []
-            for x in range(self.form.listFrameSetups.count()):
-                items.append(self.form.listFrameSetups.item(x).text())
-            if not (selection[0].Name in items):
-                self.form.listFrameSetups.addItem(selection[0].Name)
-
-    def removeFrame(self):
-        ''' remove select item from list '''
-        self.form.listFrameSetups.takeItem(self.form.listFrameSetups.currentRow())
+    def update_inner_spacing(self):
+        self.form.editInnerSpacing.setText(
+            ("{} m".format((self.form.editGapCols.value()  - self.maxWidth / 1000))))
 
     def createFrameFromPoints(self, dataframe):
         from Mechanical.Frame import PVPlantFrame
@@ -111,43 +109,61 @@ class _PVPlantPlacementTaskPanel:
             MechanicalGroup.Label = "Frames"
             FreeCAD.ActiveDocument.MechanicalGroup.addObject(MechanicalGroup)
 
-        placements = dataframe["placement"].tolist()
-        types = dataframe["type"].tolist()
-        frames = []
-        for idx in range(len(placements)):
-            newrack = PVPlantFrame.makeTracker(setup=types[idx])
-            newrack.Label = "Tracker"
-            newrack.Visibility = False
-            newrack.Placement = placements[idx]
-            MechanicalGroup.addObject(newrack)
-            frames.append(newrack)
+        if self.form.cbSubfolders.isChecked:
+            label = "Frames-" + self.PVArea.Label
+            if label in [obj.Label for obj in FreeCAD.ActiveDocument.Frames.Group]:
+                MechanicalGroup = FreeCAD.ActiveDocument.getObject(label)[0]
+            else:
+                group = FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroup", label)
+                group.Label = label
+                MechanicalGroup.addObject(group)
+                MechanicalGroup = group
+        try:
+            placements = dataframe["placement"].tolist()
+            types = dataframe["type"].tolist()
+            frames = []
+            for idx in range(len(placements)):
+                newrack = PVPlantFrame.makeTracker(setup=types[idx])
+                newrack.Label = "Tracker"
+                newrack.Visibility = False
+                newrack.Placement = placements[idx]
+                MechanicalGroup.addObject(newrack)
+                frames.append(newrack)
+        except:
+            placements = dataframe[0]
+            frames = []
+            for idx in placements:
+                print(idx)
+                newrack = PVPlantFrame.makeTracker(setup=idx[0])
+                newrack.Label = "Tracker"
+                newrack.Visibility = False
+                newrack.Placement = idx[1]
+                MechanicalGroup.addObject(newrack)
+                frames.append(newrack)
+
         if self.PVArea.Name.startswith("FrameArea"):
             self.PVArea.Frames = frames
-        # TODO: else
 
     def getProjected(self, shape):
         """ returns projected edges from a shape and a direction """
-
         if shape.BoundBox.ZLength == 0:
-            edges = shape.Edges
-            return Part.Face(Part.Wire(edges))
-        else:
-            from Utils import PVPlantUtils as utils
-            wire = utils.simplifyWire(utils.getProjected(shape))
-            if wire.isClosed():
-                wire = wire.removeSplitter()
-            return Part.Face(wire)
+            return Part.Face(Part.Wire(shape.Edges))
+
+        from Utils import PVPlantUtils as utils
+        wire = utils.simplifyWire(utils.getProjected(shape))
+        return Part.Face(wire.removeSplitter()) if wire.isClosed() else Part.Face(wire)
 
     def calculateWorkingArea(self):
         self.Area = self.getProjected(self.PVArea.Shape)
-        tmp = FreeCAD.ActiveDocument.findObjects(Name="ExclusionArea")
-        if len(tmp):
-            ProhibitedAreas = list()
-            for obj in tmp:
+        exclusion_areas  = FreeCAD.ActiveDocument.findObjects(Name="ExclusionArea")
+
+        if exclusion_areas:
+            prohibited_faces = []
+            for obj in exclusion_areas:
                 face = self.getProjected(obj.Base.Shape)
                 if face.isValid():
-                    ProhibitedAreas.append(face)
-            self.Area = self.Area.cut(ProhibitedAreas)
+                    prohibited_faces.append(face)
+            self.Area = self.Area.cut(prohibited_faces)
 
     def getAligments(self):
         # TODO: revisar todo esto: -----------------------------------------------------------------
@@ -183,7 +199,7 @@ class _PVPlantPlacementTaskPanel:
         return np.arange(startx, self.Area.BoundBox.XMax, self.gap_col, dtype=np.int64), \
             np.arange(starty, self.Area.BoundBox.YMin, -self.gap_row, dtype=np.int64)
 
-    def adjustToTerrain(self, coordinates):
+    def adjustToTerrain_old(self, coordinates):
         mode = 1
         terrain = self.Terrain.Mesh
 
@@ -280,103 +296,105 @@ class _PVPlantPlacementTaskPanel:
         placeRegion(df)
         return df
 
-        """def placeonregion_old(frames):  # old
-            for colnum, col in enumerate(frames):
-                groups = list()
-                groups.append([col[0]])
-                for i in range(1, len(col)):
-                    group = groups[-1]
-                    long = (col[i].sub(group[-1])).Length
-                    long -= width
-                    if long <= dist:
-                        group.append(col[i])
-                    else:
-                        groups.append([col[i]])
-                for group in groups:
-                    points = list()
-                    points.append(group[0].sub(vec1))
-                    for ind in range(0, len(group) - 1):
-                        points.append((group[ind].sub(vec1) + group[ind + 1].add(vec1)) / 2)
-                    points.append(group[-1].add(vec1))
-                    points3D = list()
-                    '''
-                    # v0
-                    for ind in range(len(points) - 1):
-                        line = Part.LineSegment(points[ind], points[ind + 1])
-                        tmp = terrain.makeParallelProjection(line.toShape(), FreeCAD.Vector(0, 0, 1))
-                        if len(tmp.Vertexes) > 0:
-                            if ind == 0:
-                                points3D.append(tmp.Vertexes[0].Point)
-                            points3D.append(tmp.Vertexes[-1].Point)
-                    '''
-                    # V1
-                    if type == 0:  # Mesh:
-                        import MeshPart as mp
-                        for point in points:
-                            point3D = mp.projectPointsOnMesh([point, ], terrain, FreeCAD.Vector(0, 0, 1))
-                            if len(point3D) > 0:
-                                points3D.append(point3D[0])
+    def _setup_terrain_interpolator(self):
+        """Prepara interpolador del terreno para ajuste rápido"""
+        import numpy as np
+        from scipy.interpolate import LinearNDInterpolator
 
-                    else:  # Shape:
-                        line = Part.LineSegment(points[0], points[-1])
-                        tmp = terrain.makeParallelProjection(line.toShape(), FreeCAD.Vector(0, 0, 1))
-                        if len(tmp.Vertexes) > 0:
-                            tmppoints = [ver.Point for ver in tmp.Vertexes]
-                            if mode == 1:  # mode = normal
-                                for point in points:
-                                    '''# OPTION 1:
-                                    line = Part.Line(point, point + FreeCAD.Vector(0, 0, 10))
-                                    for i in range(len(tmppoints) - 1):
-                                        seg = Part.LineSegment(tmppoints[i], tmppoints[i + 1])
-                                        inter = line.intersect(seg)
-                                        print(inter)
-                                        if len(inter) > 0:
-                                            points3D.append(FreeCAD.Vector(inter[0].X, inter[0].Y, inter[0].Z))
-                                    '''
-                                    # OPTION 2:
-                                    plane = Part.Plane(point, self.Dir)
-                                    for i in range(len(tmppoints) - 1):
-                                        seg = Part.LineSegment(tmppoints[i], tmppoints[i + 1])
-                                        inter = plane.intersect(seg)
-                                        if len(inter) > 0:
-                                            if len(inter[0]):
-                                                inter = inter[0]
-                                                points3D.append(FreeCAD.Vector(inter[0].X, inter[0].Y, inter[0].Z))
-                                                break
-                            else:  # TODO: mode = Trend
-                                # TODO: check:
-                                from scipy import stats
-                                xx = list()
-                                yy = list()
-                                zz = list()
+        mesh = self.Terrain.Mesh
+        points = np.array([p.Vector for p in mesh.Points])
+        bbox = self.Area.BoundBox
 
-                                for pts in tmppoints:
-                                    xx.append(pts.x)
-                                    yy.append(pts.y)
-                                    zz.append(pts.z)
+        # Filtrar puntos dentro del área de trabajo
+        in_bbox = [
+            p for p in points
+            if bbox.XMin <= p[0] <= bbox.XMax and
+               bbox.YMin <= p[1] <= bbox.YMax
+        ]
 
-                                slope, intercept, r, p, std_err = stats.linregress(yy, zz)
+        if not in_bbox:
+            return None
 
-                                def myfunc(x):
-                                    return slope * x + intercept
+        coords = np.array(in_bbox)
+        return LinearNDInterpolator(coords[:, :2], coords[:, 2])
 
-                                x = list()
-                                x.append(yy[0])
-                                x.append(yy[-1])
-                                newzz = list(map(myfunc, x))
-                                points3D.append(FreeCAD.Vector(xx[0], yy[0], newzz[0]))
-                                points3D.append(FreeCAD.Vector(xx[-1], yy[-1], newzz[1]))
+    def adjustToTerrain(self, coordinates):
+        from scipy.ndimage import label as sclabel
+        import pandas as pd
+        import numpy as np
+        from scipy import stats
+        import MeshPart
 
-                    for ind in range(0, len(points3D) - 1):
-                        pl = FreeCAD.Placement()
-                        vec = points3D[ind] - points3D[ind + 1]
-                        pl.Base = FreeCAD.Vector(group[ind])
-                        p = (points3D[ind] + points3D[ind + 1]) / 2
-                        pl.Base.z = p.z
-                        rot = FreeCAD.Rotation(FreeCAD.Vector(-1, 0, 0), vec)
-                        pl.Rotation = FreeCAD.Rotation(rot.toEuler()[0], rot.toEuler()[1], 0)
-                        placements.append(pl)
-            return placements"""
+        # Crear matriz binaria
+        arr = np.array([[1 if obj != 0 else 0 for obj in col] for col in coordinates])
+        labeled_array, num_features = sclabel(arr)
+
+        # Construir DataFrame optimizado
+        data = []
+        terrain_interp = self._setup_terrain_interpolator()
+
+        for label in range(1, num_features + 1):
+            cols, rows = np.where(labeled_array == label)
+            for idx, (col, row) in enumerate(zip(cols, rows)):
+                frame_type, placement = coordinates[col][row]
+                data.append({
+                    'ID': len(data) + 1,
+                    'region': label,
+                    'type': frame_type,
+                    'column': col,
+                    'row': row,
+                    'placement': placement
+                })
+
+        df = pd.DataFrame(data)
+
+        # Ajustar al terreno
+        for idx, row in df.iterrows():
+            pl = row['placement']
+            yl = row['type'].Length.Value / 2
+
+            # Calcular puntos extremos
+            top_point = FreeCAD.Vector(pl.x, pl.y + yl, 0)
+            bot_point = FreeCAD.Vector(pl.x, pl.y - yl, 0)
+
+            # Usar interpolador si está disponible
+            if terrain_interp:
+                yy = np.linspace(bot_point.y, top_point.y, 10)
+                xx = np.full(10, pl.x)
+                zz = terrain_interp(xx, yy)
+
+                if not np.isnan(zz).all():
+                    slope, intercept, *_ = stats.linregress(yy, zz)
+                    z_top = slope * top_point.y + intercept
+                    z_bot = slope * bot_point.y + intercept
+                else:
+                    z_top = z_bot = 0
+            else:
+                # Fallback a proyección directa
+                line = Part.LineSegment(bot_point, top_point).toShape()
+                projected = MeshPart.projectShapeOnMesh(line, self.Terrain.Mesh, FreeCAD.Vector(0, 0, 1))[0]
+                if len(projected) >= 2:
+                    yy = [p.y for p in projected]
+                    zz = [p.z for p in projected]
+                    slope, intercept, *_ = stats.linregress(yy, zz)
+                    z_top = slope * top_point.y + intercept
+                    z_bot = slope * bot_point.y + intercept
+                else:
+                    z_top = z_bot = 0
+
+            # Actualizar placement
+            new_top = FreeCAD.Vector(top_point.x, top_point.y, z_top)
+            new_bot = FreeCAD.Vector(bot_point.x, bot_point.y, z_bot)
+
+            new_pl = FreeCAD.Placement()
+            new_pl.Base = (new_top + new_bot) / 2
+            new_pl.Rotation = FreeCAD.Rotation(
+                FreeCAD.Vector(-1, 0, 0),
+                new_top - new_bot
+            )
+            df.at[idx, 'placement'] = new_pl
+
+        return df
 
     def isInside(self, frame, point):
         if self.Area.isInside(point, 10, True):
@@ -451,86 +469,68 @@ class _PVPlantPlacementTaskPanel:
                     if countcols == self.form.editColCount.value():
                         offsetcols += valcols
                         countcols = 0
-        print("/n/n")
-        print(cols)
+
         return self.adjustToTerrain(cols)
 
     def calculateNonAlignedArray(self):
-        gap_col = FreeCAD.Units.Quantity(self.form.editGapCols.text()).Value
-        gap_row = FreeCAD.Units.Quantity(self.form.editGapRows.text()).Value + max(self.Rack.Shape.BoundBox.XLength,
-                                                                                   self.Rack.Shape.BoundBox.YLength)
-        offset_x = FreeCAD.Units.Quantity(self.form.editOffsetHorizontal.text()).Value
-        offset_y = FreeCAD.Units.Quantity(self.form.editOffsetVertical.text()).Value
+        pointsx, pointsy = self.getAligments()
 
-        Area = self.calculateWorkingArea()
+        footprints = []
+        for frame in self.FrameSetups:
+            xx = frame.Length.Value
+            yy = frame.Width.Value
+            xx_med = xx / 2
+            yy_med = yy / 2
+            rec = Part.makePolygon([FreeCAD.Vector(-xx_med, -yy_med, 0),
+                                    FreeCAD.Vector(xx_med, -yy_med, 0),
+                                    FreeCAD.Vector(xx_med, yy_med, 0),
+                                    FreeCAD.Vector(-xx_med, yy_med, 0),
+                                    FreeCAD.Vector(-xx_med, -yy_med, 0)])
+            rec.Placement.Rotation = FreeCAD.Rotation(FreeCAD.Vector(1, 0, 0), FreeCAD.Vector(0, 1, 0))
+            footprints.append([frame, rec])
+        ref = footprints.pop(0)
+        xx = ref[0].Length.Value
+        yy = ref[0].Width.Value
+        xx_med = xx / 2
+        yy_med = yy / 2
 
-        rec = Part.makePlane(self.Rack.Shape.BoundBox.YLength, self.Rack.Shape.BoundBox.XLength)
-
-        # TODO: revisar todo esto: -----------------------------------------------------------------
-        sel = FreeCADGui.Selection.getSelectionEx()[0]
-        refh = None
-        refv = None
-
-        if len(sel.SubObjects) == 0:
-            refh = refv = Area.Edges[0]
-
-        if len(sel.SubObjects) == 1:
-            refh = refv = sel.SubObjects[0]
-
-        if len(sel.SubObjects) == 2:
-            if sel.SubObjects[0].BoundBox.XLength > sel.SubObjects[1].BoundBox.XLength:
-                refh = sel.SubObjects[0]
-            else:
-                refh = sel.SubObjects[1]
-
-            if sel.SubObjects[0].BoundBox.YLength > sel.SubObjects[1].BoundBox.YLength:
-                refv = sel.SubObjects[0]
-            else:
-                refv = sel.SubObjects[1]
-
-        steps = int((refv.BoundBox.XMax - Area.BoundBox.XMin + offset_x) / gap_col)
-        startx = refv.BoundBox.XMax + offset_x - gap_col * steps
-        # todo end ----------------------------------------------------------------------------------
-
-        start = FreeCAD.Vector(startx, 0.0, 0.0)
-        pointsx = np.arange(start.x, Area.BoundBox.XMax, gap_col)
-
-        if self.form.groupCorridor.isChecked():
-            if (self.form.editColCount.value() > 0):
-                xlen = len(pointsx)
-                count = self.form.editColCount.value()
-                val = FreeCAD.Units.Quantity(self.form.editColGap.text()).Value - (
-                        gap_col - min(self.Rack.Shape.BoundBox.XLength, self.Rack.Shape.BoundBox.YLength))
-                while count <= xlen:
-                    for i, point in enumerate(pointsx):
-                        if i >= count:
-                            pointsx[i] += val
-                    count += self.form.editColCount.value()
+        # variables for corridors:
+        countcols = 0
+        countrows = 0
+        offsetcols = 0  # ??
+        offsetrows = 0  # ??
+        valcols = FreeCAD.Units.Quantity(self.form.editColGap.text()).Value - (self.gap_col - yy)
 
         pl = []
         for point in pointsx:
-            p1 = FreeCAD.Vector(point, Area.BoundBox.YMax, 0.0)
-            p2 = FreeCAD.Vector(point, Area.BoundBox.YMin, 0.0)
+            p1 = FreeCAD.Vector(point, self.Area.BoundBox.YMax, 0.0)
+            p2 = FreeCAD.Vector(point, self.Area.BoundBox.YMin, 0.0)
             line = Part.makePolygon([p1, p2])
 
-            inter = Area.section([line])
+            inter = self.Area.section([line])
             pts = [ver.Point for ver in inter.Vertexes]  # todo: sort points
             for i in range(0, len(pts), 2):
                 line = Part.LineSegment(pts[i], pts[i + 1])
-                if line.length() >= rec.BoundBox.YLength:
-                    y1 = pts[i].y - rec.BoundBox.YLength
-                    cp = rec.copy()
-                    cp.Placement.Base = FreeCAD.Vector(pts[i].x - rec.BoundBox.XLength / 2, y1, 0.0)
-                    inter = cp.cut([Area])
-                    y1 = min([ver.Point.y for ver in inter.Vertexes])
-                    pointsy = np.arange(y1, pts[i + 1].y, -gap_row)
-                    for point in pointsy:
-                        cp = rec.copy()
-                        cp.Placement.Base = FreeCAD.Vector(pts[i].x - rec.BoundBox.XLength / 2, point, 0.0)
-                        cut = cp.cut([Area], 0)
-                        if len(cut.Vertexes) == 0:
-                            Part.show(cp)
-                            pl.append(point)
+                if line.length() >= ref[1].BoundBox.YLength:
+                    y1 = pts[i].y - ref[1].BoundBox.YLength / 2
+                    cp = ref[1].copy()
+                    cp.Placement.Base = FreeCAD.Vector(pts[i].x, y1, 0.0)
+                    Part.show(cp)
+                    inter = cp.cut([self.Area])
+                    pts1 = [ver.Point for ver in inter.Vertexes]
+                    if len(pts1) == 0:
+                        continue
+                    y1 = min(pts1, key=lambda p: p.y).y
+                    pointsy = np.arange(y1, pts[i + 1].y, -self.gap_row)
+                    continue
+                    for pointy in pointsy:
+                        cp = ref[1].copy()
+                        cp.Placement.Base = FreeCAD.Vector(pts[i].x + ref[1].BoundBox.XLength / 2, pointy, 0.0)
+                        cut = cp.cut([self.Area], 0)
+                        #print(y1, " - ", pointy, " - ",  len(cut.Vertexes))
+                        #if len(cut.Vertexes) == 0:
+                        Part.show(cp)
+                        pl.append([ref[0], pointy])
         return pl
 
     def accept(self):
@@ -542,23 +542,17 @@ class _PVPlantPlacementTaskPanel:
         params.SetBool("AutoSaveEnabled", False)
         FreeCAD.ActiveDocument.RecomputesFrozen = True
 
-        items = []
-        for x in range(self.form.listFrameSetups.count()):
-            items.append(FreeCAD.ActiveDocument.getObject(self.form.listFrameSetups.item(x).text()))
-        tmpframes = list()
-        for frame in sorted(items, key=lambda rack: rack.Length, reverse=True):
-            found = False
-            for tmp in tmpframes:
-                if tmp.Length == frame.Length:
-                    found = True
-                    break
-            if not found:
-                tmpframes.append(frame)
-        self.FrameSetups = tmpframes.copy()
-        longerFrame = self.FrameSetups[0]
+        items = [
+            FreeCAD.ActiveDocument.getObject(item.text())
+            for i in range(self.form.listFrameSetups.count())
+            if (item := self.form.listFrameSetups.item(i)).checkState() == QtCore.Qt.Checked
+        ]
+
+        unique_frames = {frame.Length.Value: frame for frame in items}
+        self.FrameSetups = sorted(list(unique_frames.values()), key=lambda rack: rack.Length, reverse=True)
 
         self.gap_col = FreeCAD.Units.Quantity(self.form.editGapCols.text()).Value
-        self.gap_row = FreeCAD.Units.Quantity(self.form.editGapRows.text()).Value + longerFrame.Length.Value
+        self.gap_row = FreeCAD.Units.Quantity(self.form.editGapRows.text()).Value + self.FrameSetups[0].Length.Value
         self.offsetX = FreeCAD.Units.Quantity(self.form.editOffsetHorizontal.text()).Value
         self.offsetY = FreeCAD.Units.Quantity(self.form.editOffsetVertical.text()).Value
 
@@ -572,8 +566,14 @@ class _PVPlantPlacementTaskPanel:
             dataframe = self.calculateNonAlignedArray()
         # 3. Adjust to terrain:
         self.createFrameFromPoints(dataframe)
-        FreeCAD.ActiveDocument.commitTransaction()
 
+        import Electrical.group as egroup
+        import importlib
+        importlib.reload(egroup)
+        egroup.groupTrackersToTransformers(5000000, self.gap_row + self.FrameSetups[0].Length.Value)
+
+
+        FreeCAD.ActiveDocument.commitTransaction()
         FreeCAD.ActiveDocument.RecomputesFrozen = False
         params.SetBool("AutoSaveEnabled", auto_save_enabled)
 
@@ -581,7 +581,7 @@ class _PVPlantPlacementTaskPanel:
         print(" -- Tiempo tardado:", total_time)
         FreeCADGui.Control.closeDialog()
         FreeCAD.ActiveDocument.recompute()
-        #return True
+
 
 
 # ----------------------------------------------------------------------------------------------------------------------

PVPlantPlacement.ui

@@ -15,6 +15,318 @@
    <string>Park Settings</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" alignment="Qt::AlignmentFlag::AlignTop">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Estructura:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="2">
+    <widget class="QWidget" name="widget_2" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="buttonPVArea">
+     <property name="text">
+      <string>Add</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Configuración</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="horizontalSpacing">
+       <number>10</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>6</number>
+      </property>
+      <item row="8" column="1">
+       <widget class="QComboBox" name="comboDirV">
+        <item>
+         <property name="text">
+          <string>De arriba a abajo</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>De abajo a arriba</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Del centro a los lados</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="7" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="maximumSize">
+         <size>
+          <width>120</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Dirección Horizontal</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1">
+       <widget class="QComboBox" name="comboDirH">
+        <item>
+         <property name="text">
+          <string>De izquierda a derecha</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>De derecha a izquiera</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>De centro a los lados</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="11" column="1">
+       <widget class="QCheckBox" name="cbAlignFrames">
+        <property name="text">
+         <string>Alinear estructuras</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QSpinBox" name="editGapRows">
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        </property>
+        <property name="buttonSymbols">
+         <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+        </property>
+        <property name="suffix">
+         <string> mm</string>
+        </property>
+        <property name="maximum">
+         <number>10000</number>
+        </property>
+        <property name="value">
+         <number>500</number>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="maximumSize">
+         <size>
+          <width>120</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Pitch</string>
+        </property>
+       </widget>
+      </item>
+      <item row="9" column="1">
+       <widget class="QDoubleSpinBox" name="editOffsetHorizontal">
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        </property>
+        <property name="buttonSymbols">
+         <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+        </property>
+        <property name="suffix">
+         <string> m</string>
+        </property>
+        <property name="decimals">
+         <number>3</number>
+        </property>
+        <property name="minimum">
+         <double>-10000.000000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>10000.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="maximumSize">
+         <size>
+          <width>120</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Orientación</string>
+        </property>
+       </widget>
+      </item>
+      <item row="9" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="maximumSize">
+         <size>
+          <width>120</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Offset Horizontal</string>
+        </property>
+       </widget>
+      </item>
+      <item row="10" column="0">
+       <widget class="QLabel" name="label_9">
+        <property name="maximumSize">
+         <size>
+          <width>120</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Offset Vertical</string>
+        </property>
+       </widget>
+      </item>
+      <item row="10" column="1">
+       <widget class="QDoubleSpinBox" name="editOffsetVertical">
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        </property>
+        <property name="buttonSymbols">
+         <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+        </property>
+        <property name="suffix">
+         <string> m</string>
+        </property>
+        <property name="decimals">
+         <number>3</number>
+        </property>
+        <property name="minimum">
+         <double>-10000.000000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>10000.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QDoubleSpinBox" name="editGapCols">
+        <property name="alignment">
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+        </property>
+        <property name="buttonSymbols">
+         <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+        </property>
+        <property name="suffix">
+         <string> m</string>
+        </property>
+        <property name="decimals">
+         <number>3</number>
+        </property>
+        <property name="maximum">
+         <double>100.000000000000000</double>
+        </property>
+        <property name="value">
+         <double>5.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="comboOrientation">
+        <item>
+         <property name="text">
+          <string>Norte - Sur</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Este - Oeste</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="8" column="0">
+       <widget class="QLabel" name="label_11">
+        <property name="maximumSize">
+         <size>
+          <width>120</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Dirección Vertical</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="maximumSize">
+         <size>
+          <width>120</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Espacio entre filas</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLineEdit" name="editInnerSpacing">
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string> - Inner Spacing</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="6" column="0" colspan="3">
     <widget class="QGroupBox" name="groupCorridor">
      <property name="title">
@@ -59,10 +371,10 @@
       <item row="3" column="1">
        <widget class="QDoubleSpinBox" name="editRowGap">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
         </property>
         <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::NoButtons</enum>
+         <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
         </property>
         <property name="prefix">
          <string/>
@@ -110,10 +422,10 @@
       <item row="1" column="1">
        <widget class="QDoubleSpinBox" name="editColGap">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
         </property>
         <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::NoButtons</enum>
+         <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
         </property>
         <property name="prefix">
          <string/>
@@ -135,10 +447,10 @@
       <item row="2" column="1">
        <widget class="QSpinBox" name="editRowCount">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
         </property>
         <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::NoButtons</enum>
+         <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
         </property>
         <property name="value">
          <number>4</number>
@@ -148,10 +460,10 @@
       <item row="0" column="1">
        <widget class="QSpinBox" name="editColCount">
         <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
         </property>
         <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::NoButtons</enum>
+         <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
         </property>
         <property name="value">
          <number>8</number>
@@ -161,45 +473,6 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="buttonPVArea">
-     <property name="text">
-      <string>Add</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="QWidget" name="widget_2" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QPushButton" name="buttonAddFrame">
-        <property name="text">
-         <string>Add</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="buttonRemoveFrame">
-        <property name="text">
-         <string>Remove</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
@@ -207,282 +480,9 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="1">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="1" column="1">
     <widget class="QLineEdit" name="editPVArea"/>
    </item>
-   <item row="5" column="0" colspan="3">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Configuración</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <property name="horizontalSpacing">
-       <number>10</number>
-      </property>
-      <property name="verticalSpacing">
-       <number>6</number>
-      </property>
-      <item row="8" column="0">
-       <widget class="QLabel" name="label_9">
-        <property name="maximumSize">
-         <size>
-          <width>120</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Offset Vertical</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="maximumSize">
-         <size>
-          <width>120</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Orientación</string>
-        </property>
-       </widget>
-      </item>
-      <item row="9" column="1">
-       <widget class="QCheckBox" name="cbAlignFrames">
-        <property name="text">
-         <string>Alinear estructuras</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="label_5">
-        <property name="maximumSize">
-         <size>
-          <width>120</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Espacio entre filas</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="maximumSize">
-         <size>
-          <width>120</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Dirección Horizontal</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="label_7">
-        <property name="maximumSize">
-         <size>
-          <width>120</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Offset Horizontal</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="maximumSize">
-         <size>
-          <width>120</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Pitch</string>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="label_11">
-        <property name="maximumSize">
-         <size>
-          <width>120</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Dirección Vertical</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="comboOrientation">
-        <item>
-         <property name="text">
-          <string>Norte - Sur</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Este - Oeste</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QDoubleSpinBox" name="editGapCols">
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-        <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::NoButtons</enum>
-        </property>
-        <property name="suffix">
-         <string> m</string>
-        </property>
-        <property name="decimals">
-         <number>3</number>
-        </property>
-        <property name="maximum">
-         <double>100.000000000000000</double>
-        </property>
-        <property name="value">
-         <double>5.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1">
-       <widget class="QComboBox" name="comboDirH">
-        <item>
-         <property name="text">
-          <string>De izquierda a derecha</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>De derecha a izquiera</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>De centro a los lados</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="6" column="1">
-       <widget class="QComboBox" name="comboDirV">
-        <item>
-         <property name="text">
-          <string>De arriba a abajo</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>De abajo a arriba</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Del centro a los lados</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="7" column="1">
-       <widget class="QDoubleSpinBox" name="editOffsetHorizontal">
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-        <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::NoButtons</enum>
-        </property>
-        <property name="suffix">
-         <string> m</string>
-        </property>
-        <property name="decimals">
-         <number>3</number>
-        </property>
-        <property name="minimum">
-         <double>-10000.000000000000000</double>
-        </property>
-        <property name="maximum">
-         <double>10000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="8" column="1">
-       <widget class="QDoubleSpinBox" name="editOffsetVertical">
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-        <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::NoButtons</enum>
-        </property>
-        <property name="suffix">
-         <string> m</string>
-        </property>
-        <property name="decimals">
-         <number>3</number>
-        </property>
-        <property name="minimum">
-         <double>-10000.000000000000000</double>
-        </property>
-        <property name="maximum">
-         <double>10000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QSpinBox" name="editGapRows">
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-        <property name="buttonSymbols">
-         <enum>QAbstractSpinBox::NoButtons</enum>
-        </property>
-        <property name="suffix">
-         <string> mm</string>
-        </property>
-        <property name="maximum">
-         <number>10000</number>
-        </property>
-        <property name="value">
-         <number>500</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="0" column="0" alignment="Qt::AlignTop">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Estructura:</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="1">
     <widget class="QListWidget" name="listFrameSetups">
      <property name="maximumSize">
@@ -493,11 +493,19 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="1">
+    <widget class="QCheckBox" name="cbSubfolders">
+     <property name="text">
+      <string>Organizar en subcarpetas</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>buttonAddFrame</tabstop>
-  <tabstop>buttonRemoveFrame</tabstop>
   <tabstop>editPVArea</tabstop>
   <tabstop>buttonPVArea</tabstop>
   <tabstop>comboOrientation</tabstop>

PVPlantSite.py

@@ -771,12 +771,12 @@ class _PVPlantSite(ArchSite._Site):
         import PVPlantImportGrid
         x, y, zone_number, zone_letter = utm.from_latlon(lat, lon)
         self.obj.UtmZone = zone_list[zone_number - 1]
-        zz = PVPlantImportGrid.getElevationFromOE([[lat, lon]])
-        self.obj.Origin = FreeCAD.Vector(x * 1000, y * 1000, zz[0].z)
-        #self.obj.OriginOffset = FreeCAD.Vector(x * 1000, y * 1000, 0) #??
+
+        point = PVPlantImportGrid.getElevationFromOE([[lat, lon]])
+        self.obj.Origin = FreeCAD.Vector(point[0].x, point[0].y, point[0].z)
         self.obj.Latitude = lat
         self.obj.Longitude = lon
-        self.obj.Elevation = zz[0].z
+        self.obj.Elevation = point[0].z
 
 
 class _ViewProviderSite(ArchSite._ViewProviderSite):

PVPlantTools.py

@@ -673,8 +673,7 @@ if FreeCAD.GuiUp:
     FreeCADGui.addCommand('PVPlantTracker', PVPlantFrame.CommandTracker())
     FreeCADGui.addCommand('RackType', CommandRackGroup())
 
-
-import PVPlantFence
+from Civil.Fence import PVPlantFence
 FreeCADGui.addCommand('PVPlantFenceGroup', PVPlantFence.CommandFenceGroup())
 
 projectlist = [  # "Reload",
@@ -712,4 +711,4 @@ pv_mechanical = [
 ]
 
 objectlist = ['PVPlantTree',
-              'PVPlantFence',]
+              'PVPlantFenceGroup',]

Project/Area/PVPlantArea.py

@@ -69,6 +69,7 @@ class _Area:
         ''' Initialize the Area object '''
         self.Type = None
         self.obj = None
+        self.setProperties(obj)
 
     def setProperties(self, obj):
         pl = obj.PropertiesList
@@ -101,18 +102,18 @@ class _Area:
     def __setstate__(self, state):
         pass
 
+    def execute(self, obj):
+        ''' Execute the area object '''
+        pass
+
 
 class _ViewProviderArea:
     def __init__(self, vobj):
-        self.Object = vobj.Object
         vobj.Proxy = self
 
     def attach(self, vobj):
-        '''
-        Create Object visuals in 3D view.
-        '''
-        self.Object = vobj.Object
-        return
+        ''' Create Object visuals in 3D view. '''
+        self.ViewObject = vobj
 
     def getIcon(self):
         '''
@@ -120,6 +121,7 @@ class _ViewProviderArea:
         '''
 
         return str(os.path.join(DirIcons, "area.svg"))
+
     '''
     def claimChildren(self):
         """
@@ -159,17 +161,10 @@ class _ViewProviderArea:
         pass
 
     def __getstate__(self):
-        """
-        Save variables to file.
-        """
         return None
 
     def __setstate__(self, state):
-        """
-        Get variables from file.
-        """
-        return None
-
+        pass
 
 ''' Frame Area '''
 
@@ -311,17 +306,14 @@ class ViewProviderFrameArea(_ViewProviderArea):
 
 
 ''' offsets '''
-
-
 def makeOffsetArea(base = None, val=None):
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython", "OffsetArea")
     OffsetArea(obj)
     obj.Base = base
     ViewProviderOffsetArea(obj.ViewObject)
     if val:
-        obj.Distance = val
+        obj.OffsetDistance = val
 
-    offsets = None
     try:
         offsetsgroup = FreeCAD.ActiveDocument.Offsets
     except:
@@ -334,11 +326,13 @@ def makeOffsetArea(base = None, val=None):
 
 class OffsetArea(_Area):
     def __init__(self, obj):
-        _Area.__init__(self, obj)
-        self.setProperties(obj)
+        '''_Area.__init__(self, obj)
+        self.setProperties(obj)'''
+        super().__init__(obj)  # Llama al constructor de _Area
 
     def setProperties(self, obj):
-        _Area.setProperties(self, obj)
+        super().setProperties(obj)  # Propiedades de la clase base
+
         pl = obj.PropertiesList
         if not ("OffsetDistance" in pl):
             obj.addProperty("App::PropertyDistance",
@@ -354,24 +348,28 @@ class OffsetArea(_Area):
         self.setProperties(obj)
 
     def execute(self, obj):
-        import Utils.PVPlantUtils as utils
+        # Comprobar dependencias críticas
+        if not hasattr(obj, "Base") or not obj.Base or not obj.Base.Shape:
+            return
+        if not hasattr(PVPlantSite, "get") or not PVPlantSite.get().Terrain:
+            return
 
         base = obj.Base.Shape
         land = PVPlantSite.get().Terrain.Mesh
         vec = FreeCAD.Vector(0, 0, 1)
+
         wire = utils.getProjected(base, vec)
         wire = wire.makeOffset2D(obj.OffsetDistance.Value, 2, False, False, True)
-        tmp = mp.projectShapeOnMesh(wire, land, vec)
+        sections = mp.projectShapeOnMesh(wire, land, vec)
         pts = []
-        for section in tmp:
+        for section in sections:
             pts.extend(section)
-        obj.Shape = Part.makePolygon(pts)
 
-    def __getstate__(self):
-        return None
-
-    def __setstate__(self, state):
-        pass
+        # Crear forma solo si hay resultados
+        if sections:
+            obj.Shape = Part.makePolygon(pts)
+        else:
+            obj.Shape = Part.Shape()  # Forma vacía si falla
 
 
 class ViewProviderOffsetArea(_ViewProviderArea):
@@ -382,14 +380,12 @@ class ViewProviderOffsetArea(_ViewProviderArea):
     def claimChildren(self):
         """ Provides object grouping """
         children = []
-        if self.Object.Base:
-            children.append(self.Object.Base)
+        if self.ViewObject and self.ViewObject.Object.Base:
+            children.append(self.ViewObject.Object.Base)
         return children
 
 
 ''' Forbidden Area: '''
-
-
 def makeProhibitedArea(base = None):
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython", "ExclusionArea")
     ProhibitedArea(obj)
@@ -416,33 +412,192 @@ class ProhibitedArea(OffsetArea):
         self.Type = obj.Type = "ProhibitedArea"
         obj.Proxy = self
 
-    def onDocumentRestored(self, obj):
-        """Method run when the document is restored."""
-        self.setProperties(obj)
+        '''# Propiedades de color
+        if not hasattr(obj, "OriginalColor"):
+            obj.addProperty("App::PropertyColor",
+                            "OriginalColor",
+                            "Display",
+                            "Color for original wire")
+            obj.OriginalColor = (1.0, 0.0, 0.0)  # Rojo
 
-    def __getstate__(self):
-        return None
+        if not hasattr(obj, "OffsetColor"):
+            obj.addProperty("App::PropertyColor",
+                            "OffsetColor",
+                            "Display",
+                            "Color for offset wire")
+            obj.OffsetColor = (1.0, 0.5, 0.0)  # Naranja
 
-    def __setstate__(self, state):
-        pass
+        # Propiedades de grosor
+        if not hasattr(obj, "OriginalWidth"):
+            obj.addProperty("App::PropertyFloat",
+                            "OriginalWidth",
+                            "Display",
+                            "Line width for original wire")
+            obj.OriginalWidth = 4.0
+
+        if not hasattr(obj, "OffsetWidth"):
+            obj.addProperty("App::PropertyFloat",
+                            "OffsetWidth",
+                            "Display",
+                            "Line width for offset wire")
+            obj.OffsetWidth = 4.0'''
+
+    def execute(self, obj):
+        # Comprobar dependencias
+        if not hasattr(obj, "Base") or not obj.Base or not obj.Base.Shape:
+            return
+        if not hasattr(PVPlantSite, "get") or not PVPlantSite.get().Terrain:
+            return
+
+        base = obj.Base.Shape
+        land = PVPlantSite.get().Terrain.Mesh
+        vec = FreeCAD.Vector(0, 0, 1)
+
+        # 1. Crear wire original
+        original_wire = utils.getProjected(base, vec)
+        sections_original = mp.projectShapeOnMesh(original_wire, land, vec)
+
+        # 2. Crear wire offset
+        offset_wire = original_wire.makeOffset2D(obj.OffsetDistance.Value, 2, False, False, True)
+        sections_offset = mp.projectShapeOnMesh(offset_wire, land, vec)
+
+        # Crear formas compuestas
+        def make_polygon(sections):
+            if not sections:
+                return Part.Shape()
+            pts = []
+            for section in sections:
+                pts.extend(section)
+            return Part.makePolygon(pts)
+
+        compounds = []
+        if sections_original:
+            compounds.append(make_polygon(sections_original))
+        if sections_offset:
+            compounds.append(make_polygon(sections_offset))
+
+        if compounds:
+            obj.Shape = Part.makeCompound(compounds)
+        else:
+            obj.Shape = Part.Shape()
+
+        # Actualizar colores en la vista
+        if FreeCAD.GuiUp and obj.ViewObject:
+            obj.ViewObject.Proxy.updateVisual()
 
 
 class ViewProviderForbiddenArea(_ViewProviderArea):
+    def __init__(self, vobj):
+        super().__init__(vobj)
+        # Valores por defecto
+        self.original_color = (1.0, 0.0, 0.0)  # Rojo
+        self.offset_color = (1.0, 0.5, 0.0)  # Naranja
+        self.original_width = 4.0
+        self.offset_width = 4.0
+        self.line_widths = []  # Almacenará los grosores por arista
+
+        vobj.LineColor = (1.0, 0.0, 0.0)
+        vobj.LineWidth = 4
+        vobj.PointColor = (1.0, 0.0, 0.0)
+        vobj.PointSize = 4
+
     def getIcon(self):
-        ''' Return object treeview icon '''
+        ''' Return object treeview icon. '''
         return str(os.path.join(DirIcons, "area_forbidden.svg"))
 
     def claimChildren(self):
         """ Provides object grouping """
         children = []
-        if self.Object.Base:
-            children.append(self.Object.Base)
+        if self.ViewObject and self.ViewObject.Object.Base:
+            children.append(self.ViewObject.Object.Base)
         return children
 
+    def attach(self, vobj):
+        super().attach(vobj)
+        # Inicializar visualización
+        self.updateVisual()
+
+    def updateVisual(self):
+        """Actualiza colores y grosores de línea"""
+        if not hasattr(self, 'ViewObject') or not self.ViewObject or not self.ViewObject.Object:
+            return
+
+        obj = self.ViewObject.Object
+
+        # Obtener propiedades de color y grosor
+        try:
+            self.original_color = obj.OriginalColor
+            self.offset_color = obj.OffsetColor
+            self.original_width = obj.OriginalWidth
+            self.offset_width = obj.OffsetWidth
+        except:
+            pass
+
+        # Actualizar colores si hay forma
+        if hasattr(obj, 'Shape') and obj.Shape and not obj.Shape.isNull():
+            if len(obj.Shape.SubShapes) >= 2:
+                # Asignar colores
+                colors = []
+                colors.append(self.original_color)  # Primer wire (original)
+                colors.append(self.offset_color)  # Segundo wire (offset)
+                self.ViewObject.DiffuseColor = colors
+
+                # Preparar grosores por arista
+                #self.prepareLineWidths()
+
+                # Asignar grosores usando LineWidthArray
+                '''if self.line_widths:
+                    self.ViewObject.LineWidthArray = self.line_widths'''
+
+        # Establecer grosor global como respaldo
+        #self.ViewObject.LineWidth = max(self.original_width, self.offset_width)
+
+    def prepareLineWidths(self):
+        """Prepara la lista de grosores para cada arista"""
+        self.line_widths = []
+        obj = self.ViewObject.Object
+
+        if hasattr(obj, 'Shape') and obj.Shape and not obj.Shape.isNull():
+            # Contar aristas en cada subforma
+            for i, subshape in enumerate(obj.Shape.SubShapes):
+                edge_count = len(subshape.Edges) if hasattr(subshape, 'Edges') else 1
+
+                # Determinar grosor según tipo de wire
+                width = self.original_width if i == 0 else self.offset_width
+
+                # Asignar el mismo grosor a todas las aristas de este wire
+                self.line_widths.extend([width] * edge_count)
+
+    def onChanged(self, vobj, prop):
+        """Maneja cambios en propiedades de visualización"""
+        if prop in ["LineColor", "PointColor", "ShapeColor", "LineWidth"]:
+            self.updateVisual()
+
+    def updateData(self, obj, prop):
+        """Actualiza cuando cambian los datos del objeto"""
+        if prop == "Shape":
+            self.updateVisual()
+
+    '''def __getstate__(self):
+        return {
+            "original_color": self.original_color,
+            "offset_color": self.offset_color,
+            "original_width": self.original_width,
+            "offset_width": self.offset_width
+        }
+
+    def __setstate__(self, state):
+        if "original_color" in state:
+            self.original_color = state["original_color"]
+        if "offset_color" in state:
+            self.offset_color = state["offset_color"]
+        if "original_width" in state:
+            self.original_width = state.get("original_width", 4.0)
+        if "offset_width" in state:
+            self.offset_width = state.get("offset_width", 4.0)'''
+
 
 ''' PV Area: '''
-
-
 def makePVSubplant():
     obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython", "PVSubplant")
     PVSubplant(obj)

Project/ProjectSetup.ui

@@ -39,6 +39,16 @@
        <property name="spacing">
         <number>9</number>
        </property>
+       <item row="3" column="0">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Maximum west-east slope:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QWidget" name="widget_2" native="true"/>
+       </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
@@ -46,17 +56,20 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="label_4">
+       <item row="0" column="2">
+        <widget class="QLabel" name="label_2">
          <property name="text">
-          <string>Frame coloring:</string>
+          <string>South facing</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignCenter</set>
          </property>
         </widget>
        </item>
        <item row="5" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Orientation::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -66,71 +79,20 @@
          </property>
         </spacer>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_5">
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_4">
          <property name="text">
-          <string>Maximum west-east slope:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QDoubleSpinBox" name="editWETL">
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buttonSymbols">
-          <enum>QAbstractSpinBox::NoButtons</enum>
-         </property>
-         <property name="suffix">
-          <string> º</string>
-         </property>
-         <property name="maximum">
-          <double>90.000000000000000</double>
-         </property>
-         <property name="value">
-          <double>8.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="2">
-        <widget class="QDoubleSpinBox" name="editSFTL">
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buttonSymbols">
-          <enum>QAbstractSpinBox::NoButtons</enum>
-         </property>
-         <property name="suffix">
-          <string> º</string>
-         </property>
-         <property name="maximum">
-          <double>90.000000000000000</double>
-         </property>
-         <property name="value">
-          <double>2.800000000000000</double>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QWidget" name="widget_2" native="true"/>
-       </item>
-       <item row="0" column="2">
-        <widget class="QLabel" name="label_2">
-         <property name="text">
-          <string>South facing</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <string>Frame coloring:</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QDoubleSpinBox" name="editNFTL">
          <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
          </property>
          <property name="buttonSymbols">
-          <enum>QAbstractSpinBox::NoButtons</enum>
+          <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
          </property>
          <property name="suffix">
           <string> º</string>
@@ -149,7 +111,45 @@
           <string>North Facing</string>
          </property>
          <property name="alignment">
-          <set>Qt::AlignCenter</set>
+          <set>Qt::AlignmentFlag::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <widget class="QDoubleSpinBox" name="editSFTL">
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+         </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+         </property>
+         <property name="suffix">
+          <string> º</string>
+         </property>
+         <property name="maximum">
+          <double>90.000000000000000</double>
+         </property>
+         <property name="value">
+          <double>2.800000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QDoubleSpinBox" name="editWETL">
+         <property name="alignment">
+          <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
+         </property>
+         <property name="buttonSymbols">
+          <enum>QAbstractSpinBox::ButtonSymbols::NoButtons</enum>
+         </property>
+         <property name="suffix">
+          <string> º</string>
+         </property>
+         <property name="maximum">
+          <double>90.000000000000000</double>
+         </property>
+         <property name="value">
+          <double>8.000000000000000</double>
          </property>
         </widget>
        </item>

reload.py

@@ -24,11 +24,15 @@ class _CommandReload:
     def Activated(self):
         import PVPlantPlacement, \
             PVPlantGeoreferencing, PVPlantImportGrid, PVPlantTerrainAnalisys, \
-            PVPlantSite, PVPlantRackChecking, PVPlantFence, PVPlantFencePost, PVPlantFenceGate, \
-            PVPlantCreateTerrainMesh, \
+            PVPlantSite, PVPlantRackChecking, PVPlantCreateTerrainMesh, \
             PVPlantFoundation, PVPlantBuilding, PVPlantEarthWorks, PVPlantPad, \
             PVPlantRoad, PVPlantTerrain, PVPlantStringing, PVPlantManhole, \
             GraphProfile
+
+        from Civil.Fence import PVPlantFenceGate as PVPlantFenceGate
+        from Civil.Fence import PVPlantFence as PVPlantFence
+        from Civil.Fence import PVPlantFencePost as PVPlantFencePost
+
         from Civil import PVPlantTrench
         from Vegetation import PVPlantTreeGenerator
 
@@ -59,9 +63,11 @@ class _CommandReload:
         importlib.reload(PVPlantSite)
         importlib.reload(PVPlantFrame)
         importlib.reload(PVPlantRackChecking)
+
         importlib.reload(PVPlantFence)
         importlib.reload(PVPlantFenceGate)
         importlib.reload(PVPlantFencePost)
+
         importlib.reload(PVPlantFoundation)
         importlib.reload(PVPlantCreateTerrainMesh)
         importlib.reload(PVPlantTreeGenerator)

requirements.txt

@@ -9,16 +9,12 @@ setuptools~=68.2.2
 laspy~=2.5.3
 geopy~=2.4.1
 lxml~=4.9.3
-pip~=23.3.2
-wheel~=0.42.0
-Brotli~=1.1.0
-PySocks~=1.7.1
-typing_extensions~=4.9.0
-docutils~=0.20.1
 Pillow~=10.1.0
 pyproj~=3.7.1
 simplekml~=1.3.6
 geojson~=3.1.0
 certifi~=2023.11.17
 SciPy~=1.11.4
-ezdxf~=1.4.1
+pycollada~=0.7.2
+shapely
+rtree