DataBeam :

- in LapJoint correzione a calcolo ingombro per feature basse e lunghe dalla testa.

.gitlab-ci.yml

@@ -24,14 +24,14 @@ variables:
     $FileList = Get-ChildItem("*.lua")
     ForEach ($File in $FileList) {
       $FileName = Split-Path $File -leaf
-      lua54 -o bin\$FileName $FileName
-      echo "lua54 -o bin\$FileName $FileName"
+      lua54 -o bin\$FileName -s $FileName
+      echo "lua54 -o bin\$FileName -s $FileName"
     }
     $FileList = Get-ChildItem("LuaLibs\*.lua")
     ForEach ($File in $FileList) {
       $FileName = Split-Path $File -leaf
-      lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName
-      echo "lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName"
+      lua54 -o bin\LuaLibs\$FileName -s LuaLibs\$FileName
+      echo "lua54 -o bin\LuaLibs\$FileName -s LuaLibs\$FileName"
     }
 
 # helper copia SORGENTI verso cartella di rete X:\ dei SORGENTI

Compile.bat

@@ -4,52 +4,52 @@ REM Per togliere info di debug aggiungere flag -s prima del nome del file di inp
 
 REM Compilazione 32 e 64 bit
 
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\BeamExec.lua                      LuaLibs\BeamExec.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\BeamLib.lua                       LuaLibs\BeamLib.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\DiceCut.lua                       LuaLibs\DiceCut.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\FaceByPocket.lua                  LuaLibs\FaceByPocket.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\FacesBySaw.lua                    LuaLibs\FacesBySaw.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\FeatureTopology.lua               LuaLibs\FeatureTopology.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\MachiningLib.lua                  LuaLibs\MachiningLib.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessBlockHausFront.lua         LuaLibs\ProcessBlockHausFront.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessChamfer.lua                LuaLibs\ProcessChamfer.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessCut.lua                    LuaLibs\ProcessCut.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDecor.lua                  LuaLibs\ProcessDecor.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDoubleCut.lua              LuaLibs\ProcessDoubleCut.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDovetail.lua               LuaLibs\ProcessDovetail.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDrill.lua                  LuaLibs\ProcessDrill.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDtMortise.lua              LuaLibs\ProcessDtMortise.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDtTenon.lua                LuaLibs\ProcessDtTenon.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessFreeContour.lua            LuaLibs\ProcessFreeContour.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessFrenchRidgeLap.lua         LuaLibs\ProcessFrenchRidgeLap.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessHeadCut.lua                LuaLibs\ProcessHeadCut.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessLapJoint.lua               LuaLibs\ProcessLapJoint.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessLongCut.lua                LuaLibs\ProcessLongCut.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessLongDoubleCut.lua          LuaLibs\ProcessLongDoubleCut.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessMark.lua                   LuaLibs\ProcessMark.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessMortise.lua                LuaLibs\ProcessMortise.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfCamb.lua               LuaLibs\ProcessProfCamb.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfConcave.lua            LuaLibs\ProcessProfConcave.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfConvex.lua             LuaLibs\ProcessProfConvex.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfFront.lua              LuaLibs\ProcessProfFront.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfHead.lua               LuaLibs\ProcessProfHead.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessRidgeLap.lua               LuaLibs\ProcessRidgeLap.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessRoundArch.lua              LuaLibs\ProcessRoundArch.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessSawCut.lua                 LuaLibs\ProcessSawCut.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessScarfJoint.lua             LuaLibs\ProcessScarfJoint.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessSimpleScarf.lua            LuaLibs\ProcessSimpleScarf.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessSplit.lua                  LuaLibs\ProcessSplit.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessStepJoint.lua              LuaLibs\ProcessStepJoint.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessStepJointNotch.lua         LuaLibs\ProcessStepJointNotch.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessTenon.lua                  LuaLibs\ProcessTenon.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessText.lua                   LuaLibs\ProcessText.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessTyroleanDovetail.lua       LuaLibs\ProcessTyroleanDovetail.lua
-\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessVariant.lua                LuaLibs\ProcessVariant.lua
-\EgtProg\Dll32\luac54 -o bin\BatchProcess.lua                          BatchProcess.lua
-\EgtProg\Dll32\luac54 -o bin\BatchProcessNew.lua                       BatchProcessNew.lua
-\EgtProg\Dll32\luac54 -o bin\GetBeamData.lua                           GetBeamData.lua
-\EgtProg\Dll32\luac54 -o bin\NestProcess.lua                           NestProcess.lua
-\EgtProg\Dll32\luac54 -o bin\Process.lua                               Process.lua
-\EgtProg\Dll32\luac54 -o bin\Rotate.lua                                Rotate.lua
-\EgtProg\Dll32\luac54 -o bin\Swap.lua                                  Swap.lua
-\EgtProg\Dll32\luac54 -o bin\Version.lua                               Version.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\BeamExec.lua                      -s LuaLibs\BeamExec.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\BeamLib.lua                       -s LuaLibs\BeamLib.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\DiceCut.lua                       -s LuaLibs\DiceCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\FaceByPocket.lua                  -s LuaLibs\FaceByPocket.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\FacesBySaw.lua                    -s LuaLibs\FacesBySaw.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\FeatureTopology.lua               -s LuaLibs\FeatureTopology.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\MachiningLib.lua                  -s LuaLibs\MachiningLib.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessBlockHausFront.lua         -s LuaLibs\ProcessBlockHausFront.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessChamfer.lua                -s LuaLibs\ProcessChamfer.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessCut.lua                    -s LuaLibs\ProcessCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDecor.lua                  -s LuaLibs\ProcessDecor.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDoubleCut.lua              -s LuaLibs\ProcessDoubleCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDovetail.lua               -s LuaLibs\ProcessDovetail.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDrill.lua                  -s LuaLibs\ProcessDrill.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDtMortise.lua              -s LuaLibs\ProcessDtMortise.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessDtTenon.lua                -s LuaLibs\ProcessDtTenon.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessFreeContour.lua            -s LuaLibs\ProcessFreeContour.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessFrenchRidgeLap.lua         -s LuaLibs\ProcessFrenchRidgeLap.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessHeadCut.lua                -s LuaLibs\ProcessHeadCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessLapJoint.lua               -s LuaLibs\ProcessLapJoint.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessLongCut.lua                -s LuaLibs\ProcessLongCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessLongDoubleCut.lua          -s LuaLibs\ProcessLongDoubleCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessMark.lua                   -s LuaLibs\ProcessMark.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessMortise.lua                -s LuaLibs\ProcessMortise.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfCamb.lua               -s LuaLibs\ProcessProfCamb.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfConcave.lua            -s LuaLibs\ProcessProfConcave.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfConvex.lua             -s LuaLibs\ProcessProfConvex.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfFront.lua              -s LuaLibs\ProcessProfFront.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessProfHead.lua               -s LuaLibs\ProcessProfHead.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessRidgeLap.lua               -s LuaLibs\ProcessRidgeLap.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessRoundArch.lua              -s LuaLibs\ProcessRoundArch.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessSawCut.lua                 -s LuaLibs\ProcessSawCut.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessScarfJoint.lua             -s LuaLibs\ProcessScarfJoint.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessSimpleScarf.lua            -s LuaLibs\ProcessSimpleScarf.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessSplit.lua                  -s LuaLibs\ProcessSplit.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessStepJoint.lua              -s LuaLibs\ProcessStepJoint.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessStepJointNotch.lua         -s LuaLibs\ProcessStepJointNotch.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessTenon.lua                  -s LuaLibs\ProcessTenon.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessText.lua                   -s LuaLibs\ProcessText.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessTyroleanDovetail.lua       -s LuaLibs\ProcessTyroleanDovetail.lua
+\EgtProg\Dll32\luac54 -o bin\LuaLibs\ProcessVariant.lua                -s LuaLibs\ProcessVariant.lua
+\EgtProg\Dll32\luac54 -o bin\BatchProcess.lua                          -s BatchProcess.lua
+\EgtProg\Dll32\luac54 -o bin\BatchProcessNew.lua                       -s BatchProcessNew.lua
+\EgtProg\Dll32\luac54 -o bin\GetBeamData.lua                           -s GetBeamData.lua
+\EgtProg\Dll32\luac54 -o bin\NestProcess.lua                           -s NestProcess.lua
+\EgtProg\Dll32\luac54 -o bin\Process.lua                               -s Process.lua
+\EgtProg\Dll32\luac54 -o bin\Rotate.lua                                -s Rotate.lua
+\EgtProg\Dll32\luac54 -o bin\Swap.lua                                  -s Swap.lua
+\EgtProg\Dll32\luac54 -o bin\Version.lua                               -s Version.lua

LuaLibs/BeamExec.lua

@@ -58,6 +58,10 @@
 -- 2024/02/19 In Collect aggiunta la scrittura nella Proc di Width e Height delle facce.
 -- 2024/02/29 Migliorata 'CompareFeatures' per ordine forature
 -- 2024/03/04 Creata funzione calcolo dipendenze tra feature con calcolo topologia.
+-- 2024/03/07 Implementate le lavorazioni in doppio per fori specchiati non passanti e DrillPocket.
+-- 2024/03/11 In CollectFeatures si scrive ora Width e Height della faccia sia trimmate con il grezzo che intere.
+-- 2024/03/13 In CollectFeatures si scrive lunghezza foro su Proc e si controla se serve Predrill
+--            In OrderFeature, preforo sempre prima del foro
 
 -- Tabella per definizione modulo
 local BeamExec = {}
@@ -347,22 +351,41 @@ local function CollectFeatures( PartId, b3Raw, dCurrOvmH, dCurrOvmT)
                   if not Proc.Face then
                      Proc.Face = {}
                      for i = 1, Proc.Fct do
-                        local _, dFaceWidth, dFaceHeight = BL.GetFaceHvRefDim( Proc.Id, i - 1, b3Raw)
-                        Proc.Face[i] = { Id = i - 1, VtN = EgtSurfTmFacetNormVersor( Proc.Id, i - 1, GDB_ID.ROOT ), Width = dFaceWidth, Height = dFaceHeight}
+                        Proc.Face[i] = { Id = i - 1, VtN = EgtSurfTmFacetNormVersor( Proc.Id, i - 1, GDB_ID.ROOT )}
                         if Proc.Fct < 10 then
+                           local frHV, dFaceWidthTrimmed, dFaceHeightTrimmed = BL.GetFaceHvRefDim( Proc.Id, i - 1, b3Raw)
+                           -- frame OCS faccia
+                           Proc.Face[i].FrameHV = frHV
+                           -- larghezza OCS faccia trimmata con grezzo
+                           Proc.Face[i].WidthTrimmed = dFaceWidthTrimmed
+                           -- altezza OCS faccia trimmata con grezzo
+                           Proc.Face[i].HeightTrimmed = dFaceHeightTrimmed
+                           local _, dFaceWidth, dFaceHeight = BL.GetFaceHvRefDim( Proc.Id, i - 1)
+                           -- larghezza OCS faccia
+                           Proc.Face[i].Width = dFaceWidth
+                           -- altezza OCS faccia
+                           Proc.Face[i].Height = dFaceHeight
+                           -- elevazione calcolata rispetto al box della parte
                            Proc.Face[i].Elevation = EgtSurfTmFacetElevationInBBox( Proc.Id, i - 1, b3Solid, true, GDB_ID.ROOT)
                         end
                      end
                   end
                end
-               if Proc.Box and not Proc.Box:isEmpty() then 
+               if Proc.Box and not Proc.Box:isEmpty() then
                   Proc.Head = IsHeadFeature( Proc, b3Raw, dCurrOvmH)
                   Proc.Tail, Proc.AdvTail = IsTailFeature( Proc, b3Raw, dCurrOvmH, dCurrOvmT)
                   table.insert( vProc, Proc)
                   -- se foro
                   if Drill.Identify( Proc) then
                      -- assegno diametro e facce di ingresso e uscita (dati tabelle sempre per riferimento)
-                     Proc.Diam, Proc.Fcs, Proc.Fce = Drill.GetData( Proc, b3Raw)
+                     Proc.Diam, Proc.Len, Proc.Fcs, Proc.Fce = Drill.GetData( Proc, b3Raw)
+                     -- verifico se devo inserire i prefori
+                     if Drill.IsPredrillNeeded( Proc) then
+                        local bAddProc, PredrillProc= Drill.AddPredrillFromDrillProc( Proc)
+                        if bAddProc then
+                           table.insert( vProc, PredrillProc)
+                        end
+                     end
                      -- verifico se necessaria seconda lavorazione da parte opposta per foro più lungo della punta
                      if Drill.Split( Proc, b3Raw) then
                         -- aggiorno flags prima parte foro (dati tabelle sempre per riferimento)
@@ -379,6 +402,7 @@ local function CollectFeatures( PartId, b3Raw, dCurrOvmH, dCurrOvmT)
                         Proc2.Box = BBox3d( Proc.Box)
                         Proc2.Fct = Proc.Fct
                         Proc2.Diam = Proc.Diam
+                        Proc2.Len = Proc.Len
                         Proc2.Head = Drill.IsHeadFeature( Proc2, b3Raw, dCurrOvmH)
                         Proc2.Tail = Drill.IsTailFeature( Proc2, b3Raw, dCurrOvmH)
                         Proc2.Fcs = Proc.Fce
@@ -388,6 +412,13 @@ local function CollectFeatures( PartId, b3Raw, dCurrOvmH, dCurrOvmT)
                         Proc2.AdjId = Proc.AdjId
                         Proc2.MainId = Proc.MainId
                         table.insert( vProc, Proc2)
+                        -- verifico se devo inserire i prefori
+                        if Drill.IsPredrillNeeded( Proc2) then
+                           local bAddProc, PredrillProc= Drill.AddPredrillFromDrillProc( Proc2)
+                           if bAddProc then
+                              table.insert( vProc, PredrillProc)
+                           end
+                        end
                      end
                   -- se BlockHaus HalfLap
                   elseif Proc.Prc == 37 then
@@ -908,7 +939,11 @@ local function OrderFeatures( vProc, b3Raw)
       end
       -- se entrambi fori con posizione praticamente uguale ordino secondo diametro e faccia di inizio (Fcs)
       if B1.Prc == 40  and  B2.Prc == 40  and  abs( B1.Box:getCenter():getX() - B2.Box:getCenter():getX()) < dSmallDrillRange then
-         if abs( B1.Diam - B2.Diam) < 1.0 then
+         if B1.IsPredrill and not B2.IsPredrill then
+            return true
+         elseif not B1.IsPredrill and B2.IsPredrill then
+            return false
+         elseif abs( B1.Diam - B2.Diam) < 1.0 then
             if B1.Fcs == B2.Fcs then
                if abs( B1.Box:getCenter():getX() - B2.Box:getCenter():getX()) < 1.0  then
                   if abs( B1.Box:getCenter():getY() - B2.Box:getCenter():getY()) < 1.0  then
@@ -1552,30 +1587,29 @@ local function CheckMirrorPocket( Proc, ProcMirror, b3Raw, AuxId)
          return false
       end
    end
-   -- devono avere il centro allineato, essere equidistanti dalla mezzaria trave e non essere troppo vicine
+   -- devono avere il centro allineato, essere equidistanti dalla mezzeria trave e non essere troppo vicine
    local vtDisplacement = ptBC - ptBCMirror
    local ptCenRaw = b3Raw:getCenter()
-   local dMinimumDistanceMirroredFeatures = 50
    if AreSameOrOppositeVectorApprox( vtExtr, Y_AX()) then
       local dYMinDistance = max( b3Proc:getMin():getY(), b3ProcMirror:getMin():getY()) - min( b3Proc:getMax():getY(), b3ProcMirror:getMax():getY())
-      if not ( abs( vtDisplacement:getX()) < 500 * GEO.EPS_SMALL and abs( vtDisplacement:getZ()) < 500 * GEO.EPS_SMALL and 
+      if not ( abs( vtDisplacement:getX()) < 500 * GEO.EPS_SMALL and abs( vtDisplacement:getZ()) < 500 * GEO.EPS_SMALL and
                ( abs( ptBC:getY() - ptCenRaw:getY()) - abs( ptBCMirror:getY() - ptCenRaw:getY())) < 500 * GEO.EPS_SMALL and
-               dYMinDistance > dMinimumDistanceMirroredFeatures + 10 * GEO.EPS_SMALL) then
+               dYMinDistance > MIRROR_POCKETS_MIN_DISTANCE + 10 * GEO.EPS_SMALL) then
          return false
       end
    elseif AreSameOrOppositeVectorApprox( vtExtr, Z_AX()) then
       local dZMinDistance = max( b3Proc:getMin():getZ(), b3ProcMirror:getMin():getZ()) - min( b3Proc:getMax():getZ(), b3ProcMirror:getMax():getZ())
-      if not ( abs( vtDisplacement:getX()) < 500 * GEO.EPS_SMALL and abs( vtDisplacement:getY()) < 500 * GEO.EPS_SMALL and 
+      if not ( abs( vtDisplacement:getX()) < 500 * GEO.EPS_SMALL and abs( vtDisplacement:getY()) < 500 * GEO.EPS_SMALL and
                ( abs( ptBC:getZ() - ptCenRaw:getZ()) - abs( ptBCMirror:getZ() - ptCenRaw:getZ())) < 500 * GEO.EPS_SMALL and
-               dZMinDistance > dMinimumDistanceMirroredFeatures + 10 * GEO.EPS_SMALL) then
+               dZMinDistance > MIRROR_POCKETS_MIN_DISTANCE + 10 * GEO.EPS_SMALL) then
          return false
       end
    else
       return false
    end
    -- devono avere box con le stesse dimensioni
-   if not ( abs( b3DtMrt:getDimX() - b3DtMrtMirror:getDimX()) < 500 * GEO.EPS_SMALL and 
-            abs( b3DtMrt:getDimY() - b3DtMrtMirror:getDimY()) < 500 * GEO.EPS_SMALL and 
+   if not ( abs( b3DtMrt:getDimX() - b3DtMrtMirror:getDimX()) < 500 * GEO.EPS_SMALL and
+            abs( b3DtMrt:getDimY() - b3DtMrtMirror:getDimY()) < 500 * GEO.EPS_SMALL and
             abs( b3DtMrt:getDimZ() - b3DtMrtMirror:getDimZ()) < 500 * GEO.EPS_SMALL) then
       return false
    end
@@ -1767,18 +1801,21 @@ local function VerifyDrillMirrored( Proc, vProc, b3Raw)
    if not AuxId  or  EgtGetType( AuxId) ~= GDB_TY.CRV_ARC then
       return
    end
+   -- verifico se foratura splittata oppure da specchiare
+   local bIsDrillingOkForMirror = abs( Proc.Flg) == 2 or ( Proc.Mirror ~= nil)
+   if not bIsDrillingOkForMirror then return end
    -- recupero direzione e dimensioni del foro
    local vtExtr = EgtCurveExtrusion( AuxId, GDB_RT.GLOB)
    local dDiam = 2 * EgtArcRadius( AuxId)
    local dLen = abs( EgtCurveThickness( AuxId))
-   local dMachiningDepth = dLen / 2 + BD.DRILL_OVERLAP
+   local dMachiningDepth = EgtIf( abs( Proc.Flg) == 2, dLen / 2 + BD.DRILL_OVERLAP, dLen)
    -- recupero lavorazione adatta
    local sDrilling, sType, dMaxDepth = ML.FindDrilling( dDiam, dMachiningDepth, true, false, true)
    if not sDrilling then
       sDrilling, sType, dMaxDepth = ML.FindDrilling( dDiam, 0, true, false, true)
       dMachiningDepth = dMaxDepth or dMachiningDepth
    end
-   if not sDrilling or sType ~= 'Drill' or not EgtMdbSetCurrMachining( sDrilling) then
+   if not sDrilling or ( sType ~= 'Drill' and sType ~= 'Pocket') or not EgtMdbSetCurrMachining( sDrilling) then
       return
    end
    local dDrillingStep = EgtMdbGetCurrMachiningParam( MCH_MP.STEP)
@@ -1786,7 +1823,8 @@ local function VerifyDrillMirrored( Proc, vProc, b3Raw)
    if not EgtTdbSetCurrTool( EgtMdbGetCurrMachiningParam( MCH_MP.TOOL) or '') then
       return
    end
-   -- recupero la lunghezza della parte inclinata della punta
+   -- recupero diametro utensile e lunghezza della parte inclinata della punta
+   local dToolDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM, 'd')
    local dToolTipLength = EgtTdbGetCurrToolParam( MCH_TP.TOTLEN) - EgtTdbGetCurrToolParam( MCH_TP.LEN)
    -- recupero eventuale utensile in doppio, suo diametro e massima lavorazione
    local sToolDoubleName = EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'DOUBLE', 's')
@@ -1795,24 +1833,27 @@ local function VerifyDrillMirrored( Proc, vProc, b3Raw)
    end
    local dToolDoubleDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM, 'd')
    local dToolDoubleMaxDepth = EgtTdbGetCurrToolParam( MCH_TP.MAXMAT)
+   dMachiningDepth = min( dMachiningDepth, dToolDoubleMaxDepth)
    -- recupero la lunghezza della parte inclinata della punta
    local dToolDoubleTipLength = EgtTdbGetCurrToolParam( MCH_TP.TOTLEN) - EgtTdbGetCurrToolParam( MCH_TP.LEN)
+   -- se foratura splittata, verifico che la distanza minima tra le due punte sia rispettata
+   if abs( Proc.Flg) == 2 and not ( ( ( 2 * dDrillingStep - dToolTipLength - dToolDoubleTipLength) - MIRROR_DRILLINGS_MIN_DISTANCE) > 10 * GEO.EPS_SMALL) then
+      return
+   end
    -- verifico se in doppio
-   local dMinimumDistanceMirroredFeatures = 40
-   dMachiningDepth = min( dMachiningDepth, dToolDoubleMaxDepth)
-   if abs( Proc.Flg) == 2 and dToolDoubleDiam < dDiam + 10 * GEO.EPS_SMALL and dToolDoubleDiam > dDiam - BD.DRILL_TOL - 10 * GEO.EPS_SMALL and
-   (( 2 * dDrillingStep - dToolTipLength - dToolDoubleTipLength) - dMinimumDistanceMirroredFeatures) > 10 * GEO.EPS_SMALL then
-      if Proc.Fce ~= 0 then
+   if ( abs( dToolDiam - dToolDoubleDiam) < 10 * GEO.EPS_SMALL) then
+      if Proc.Fce ~= 0 or Proc.Mirror then
          if Proc.Flg == -2 then vtExtr = -vtExtr end
+         local ProcToDisable = EgtIf( abs( Proc.Flg) == 2, Proc, Proc.Mirror)
          if ( not BD.DOWN_HEAD and AreSameVectorApprox( vtExtr, Y_AX())) or
             ( BD.DOWN_HEAD and AreOppositeVectorApprox( vtExtr, Y_AX())) then
             Proc.Double = 2
             Proc.MachDepthDouble = dMachiningDepth
-            DisableOtherDrilling( Proc, vProc)
+            DisableOtherDrilling( ProcToDisable, vProc)
          elseif BD.DOWN_HEAD and AreSameVectorApprox( vtExtr, Z_AX()) then
             Proc.Double = 3
             Proc.MachDepthDouble = dMachiningDepth
-            DisableOtherDrilling( Proc, vProc)
+            DisableOtherDrilling( ProcToDisable, vProc)
          end
       end
    end
@@ -1894,25 +1935,98 @@ local function SetDrillingsToMachineAfterHeadOrTailCut( vProc, vMachineBeforeInt
    end
 end
 
+-------------------------------------------------------------------------------------------------------------
+local function AreDrillingsMirrored( Proc, ProcMirror, b3Raw)
+   if Proc.Id == ProcMirror.Id then return false end
+
+   -- geometria ausiliaria foro principale
+   AuxId = EgtGetInfo( Proc.Id, 'AUXID', 'i')
+   if AuxId then AuxId = AuxId + Proc.Id end
+   if not AuxId or EgtGetType( AuxId ) ~= GDB_TY.CRV_ARC then return false end
+   -- geometria ausiliaria foro specchiato
+   local AuxIdMirror = EgtGetInfo( ProcMirror.Id, 'AUXID', 'i')
+   if AuxIdMirror then AuxIdMirror = AuxIdMirror + ProcMirror.Id end
+   if not AuxIdMirror or EgtGetType( AuxIdMirror ) ~= GDB_TY.CRV_ARC then return false end
+   -- dati del foro principale
+   local vtExtr = EgtCurveExtrusion( AuxId, GDB_RT.GLOB)
+   local ptBC = EgtGP( AuxId, GDB_RT.GLOB)
+   -- dati del foro specchiato
+   local vtExtrMirror = EgtCurveExtrusion( AuxIdMirror, GDB_RT.GLOB)
+   local ptBCMirror = EgtGP( AuxIdMirror, GDB_RT.GLOB)
+
+   -- direzione fori
+   local nDouble
+   if AreOppositeVectorApprox( vtExtr, vtExtrMirror) then
+      -- fori lungo Y
+      -- per macchine tipo PF il foro principale è sul lato back, per macchine tipo PF1250 è sul lato front
+      if ( BD.TWO_EQUAL_HEADS and AreSameVectorApprox( vtExtr, Y_AX())) or
+      ( BD.DOWN_HEAD and AreOppositeVectorApprox( vtExtr, Y_AX())) then
+         nDouble = 2
+      -- fori lungo Z
+      elseif BD.DOWN_HEAD and AreSameVectorApprox( vtExtr, Z_AX()) then
+         nDouble = 3
+      else
+         return false
+      end
+   else
+      return false
+   end
+
+   -- centri allineati, equidistanti dalla mezzeria trave, non troppo vicini
+   local vtDisplacement = ptBC - ptBCMirror
+   local ptCenRaw = b3Raw:getCenter()
+   if nDouble == 2 then
+      local dYMinDistance = max( Proc.Box:getMin():getY(), ProcMirror.Box:getMin():getY()) - min( Proc.Box:getMax():getY(), ProcMirror.Box:getMax():getY())
+      if not ( abs( vtDisplacement:getX()) < 100 * GEO.EPS_SMALL and abs( vtDisplacement:getZ()) < 100 * GEO.EPS_SMALL and
+               ( abs( ptBC:getY() - ptCenRaw:getY()) - abs( ptBCMirror:getY() - ptCenRaw:getY())) < 100 * GEO.EPS_SMALL and
+               dYMinDistance > MIRROR_DRILLINGS_MIN_DISTANCE + 10 * GEO.EPS_SMALL) then
+         return false
+      end
+   else
+      local dZMinDistance = max( Proc.Box:getMin():getZ(), ProcMirror.Box:getMin():getZ()) - min( Proc.Box:getMax():getZ(), ProcMirror.Box:getMax():getZ())
+      if not ( abs( vtDisplacement:getX()) < 100 * GEO.EPS_SMALL and abs( vtDisplacement:getY()) < 100 * GEO.EPS_SMALL and
+               ( abs( ptBC:getZ() - ptCenRaw:getZ()) - abs( ptBCMirror:getZ() - ptCenRaw:getZ())) < 100 * GEO.EPS_SMALL and
+               dZMinDistance > MIRROR_DRILLINGS_MIN_DISTANCE + 10 * GEO.EPS_SMALL) then
+         return false
+      end
+   end
+
+   -- fori della stessa profondità
+   if abs( Proc.Len - ProcMirror.Len) > 10 * GEO.EPS_SMALL then
+      return false
+   end
+
+   return true
+end
+
 -------------------------------------------------------------------------------------------------------------
 function GetFeatureInfoAndDependency( vProc, b3Raw)
    -- ciclo tutte le feature
    for i = 1, #vProc do
+      local Proc = vProc[i]
       -- calcolo topologia della feature
-      if NeedTopologyFeature( vProc[i]) then
-         Topology.Classify( vProc[i], b3Raw)
+      if NeedTopologyFeature( Proc) then
+         Topology.Classify( Proc, b3Raw)
       -- se non richiesto, setto 'SPECIAL'
       else
-         vProc[i].Topology = 'SPECIAL'
-         vProc[i].TopologyLongName = vProc[i].Topology
+         Proc.Topology = 'SPECIAL'
+         Proc.TopologyLongName = Proc.Topology
       end
-
       -- controllo la feature con tutte le altre per recuperare le dipendenze
       for j = 1, #vProc do
          local ProcB = vProc[j]
          -- verifico se feature tipo LapJoint è attraversata da almeno un foro
-         if ( vProc[i].Topology == 'Pocket' or vProc[i].Topology == 'Tunnel' or vProc[i].Topology == 'Groove' or Mortise.Identify( vProc[i])) and Drill.Identify( ProcB) and Overlaps( vProc[i].Box, ProcB.Box) then
-            vProc[i].PassedByHole = true
+         if ( Proc.Topology == 'Pocket' or Proc.Topology == 'Tunnel' or Proc.Topology == 'Groove' or Mortise.Identify( Proc)) and Drill.Identify( ProcB) and Overlaps( Proc.Box, ProcB.Box) then
+            Proc.PassedByHole = true
+         end
+         -- verifiche per specchiature
+         if BD.DOWN_HEAD or BD.TWO_EQUAL_HEADS then
+            -- forature
+            if BD.DOUBLE_HEAD_DRILLING and Drill.Identify( Proc) and Drill.Identify( ProcB) and not Proc.Mirror then
+               if AreDrillingsMirrored( Proc, ProcB, b3Raw) then
+                  Proc.Mirror = ProcB
+               end
+            end
          end
       end
    end
@@ -1923,6 +2037,9 @@ function BeamExec.ProcessFeatures()
    if BD.IMPROVE_HEAD_TAIL_DRILLINGS == nil then
       BD.IMPROVE_HEAD_TAIL_DRILLINGS = true
    end
+   -- costanti per doppio
+   MIRROR_DRILLINGS_MIN_DISTANCE = 40
+   MIRROR_POCKETS_MIN_DISTANCE = 50
    -- verifica se possibile rotazione di 90 gradi
    BD.ROT90 = BD.ROT90 and Verify90DegRotation( EgtGetFirstRawPart())
    -- ciclo sui pezzi
@@ -1956,7 +2073,7 @@ function BeamExec.ProcessFeatures()
 
       -- verifica presenza forature influenzate da lavorazioni di testa o coda
       if BD.IMPROVE_HEAD_TAIL_DRILLINGS then
-         vMachBeforeIntersDrillings = CalcHeadTailMachBeforeIntersDrillings( vProc, b3Raw)
+         local vMachBeforeIntersDrillings = CalcHeadTailMachBeforeIntersDrillings( vProc, b3Raw)
          SetDrillingsToMachineAfterHeadOrTailCut( vProc, vMachBeforeIntersDrillings)
       end
       -- verifica presenza di feature specchiate per eventuali lavorazioni simultanee

LuaLibs/MachiningLib.lua

@@ -13,6 +13,7 @@
 -- 2024/01/23 Nella GetMachinings vengono ora raccolti i parametri utensile necessari per i VerifyTool, scritti direttamente nella tabella Machining.Tool.
 --            Le lavorazioni possono essere ora ordinate per dimensioni utensile (Longest, Shortest, Biggest, Smallest) se passato l'apposito parametro SortingCriterion in FindMachining. Al momento implementato solo per FindSawing.
 -- 2024/03/01 In VerifyPocketing implementato l'ordinamento per dimensioni utensile.
+-- 2024/03/13 Aggiunta gestione Predrill
 
 -- Tabella per definizione modulo
 local MachiningLib = {}
@@ -169,7 +170,7 @@ end
 ---------------------------------------------------------------------
 function VerifyTool( Machining, MachiningType, Params, bH2)
    if MachiningType == MCH_MY.DRILLING then
-      if Machining.SubType == 'Drill' or Machining.SubType == 'AngleDrill' then
+      if Machining.SubType == 'Drill' or Machining.SubType == 'AngleDrill' or Machining.SubType == 'Predrill' then
          return VerifyDrill( Machining, Params.Diam, Params.Depth, bH2)
       elseif Machining.SubType == 'DrillPocket' then
          return VerifyDrillPocket( Machining, Params.Diam, Params.Depth, bH2)
@@ -225,6 +226,8 @@ function GetMachinings( MachiningType, sType)
                      Machining.SubType = 'AngleDrill'
                   elseif EgtStartsWith( Machining.Type, 'Pocket') then
                      Machining.SubType = 'DrillPocket'
+                  elseif EgtStartsWith( Machining.Type, 'Predrill') then
+                     Machining.SubType = 'Predrill'
                   end
                end
                Machining.Tool.Diameter = EgtTdbGetCurrToolParam( MCH_TP.DIAM)
@@ -300,7 +303,7 @@ end
 function ReturnParams( MachiningType, MachiningName, sType, ToolParams)
    if MachiningType == MCH_MY.DRILLING then
       local _, sOrigType = EgtEndsWith( sType, '_H2')
-      return MachiningName, sType, EgtIf( sOrigType == 'Drill' or sOrigType == 'Drill_AT' or sOrigType == 'AngleDrill' , ToolParams.TMaxMat, ToolParams.TMaxDepth), ToolParams.MaxToolLength, ToolParams.ToolDiam, ToolParams.DiamTh, ToolParams.FreeLen
+      return MachiningName, sType, EgtIf( sOrigType == 'Drill' or sOrigType == 'Drill_AT' or sOrigType == 'AngleDrill' or sOrigType == 'Predrill' , ToolParams.TMaxMat, ToolParams.TMaxDepth), ToolParams.MaxToolLength, ToolParams.ToolDiam, ToolParams.DiamTh, ToolParams.FreeLen
    elseif MachiningType == MCH_MY.SAWING then
       return MachiningName, ToolParams.H2
    elseif MachiningType == MCH_MY.MILLING then
@@ -467,8 +470,15 @@ function MachiningLib.FindCutting( sType, bTopHead, bDownHead)
 end
 
 ---------------------------------------------------------------------
-function MachiningLib.FindDrilling( dDiam, dDepth, bTopHead, bDownHead, bExcludeH2, bAngleTransmission)
-   local MachiningName, MachiningType, Param1, Param2, Param3, Param4, Param5 = FindMachining( MCH_MY.DRILLING, EgtIf( bAngleTransmission, 'Drill_AT', 'Drill'), { Diam = dDiam, Depth = dDepth}, bTopHead, bDownHead, bExcludeH2)
+function MachiningLib.FindDrilling( dDiam, dDepth, bTopHead, bDownHead, bExcludeH2, bAngleTransmission, bIsPredrill)
+   local MachiningName, MachiningType, Param1, Param2, Param3, Param4, Param5, sTypeMach
+   -- se il foro è un predrill, cerco solo punte abilitate al Predrill
+   if bIsPredrill then
+      sTypeMach = 'Predrill'
+   else
+      sTypeMach = EgtIf( bAngleTransmission, 'Drill_AT', 'Drill')
+   end
+   MachiningName, MachiningType, Param1, Param2, Param3, Param4, Param5 = FindMachining( MCH_MY.DRILLING, sTypeMach, { Diam = dDiam, Depth = dDepth}, bTopHead, bDownHead, bExcludeH2)
    if ( not MachiningName or MachiningName == '') then
       MachiningName, MachiningType, Param1, Param2, Param3, Param4, Param5 = FindMachining( MCH_MY.DRILLING, EgtIf( bAngleTransmission, 'Pocket_AT', 'Pocket'), { Diam = dDiam, Depth = dDepth}, bTopHead, bDownHead)
    end

LuaLibs/ProcessDrill.lua

@@ -20,6 +20,7 @@
 -- 2023/07/28 Aggiunta gestione rinvio 90deg solo per forature da sotto esattamente verticali.
 -- 2023/09/26 Se errore in applicazione lavorazione si inverte e riprova solo se foratura singola su foro aperto.
 -- 2023/11/06 Migliorata gestione dei fori con AngularTransmission.
+-- 2024/03/13 Aggiunta gestione Predrill
 
 -- Tabella per definizione modulo
 local ProcessDrill = {}
@@ -96,20 +97,21 @@ end
 ---------------------------------------------------------------------
 -- Recupero dati foro e adattamento se speciale
 function ProcessDrill.GetData( Proc, b3Raw)
+   local AuxId = EgtGetInfo( Proc.Id, 'AUXID', 'i')
    -- verifico se foro da adattare
    if EgtExistsInfo( Proc.Id, 'DiamUser') then
-      local AuxId = EgtGetInfo( Proc.Id, 'AUXID', 'i')
       if AuxId then AuxId = AuxId + Proc.Id end
       if AuxId and EgtGetType( AuxId) == GDB_TY.CRV_ARC and BD.USER_HOLE_DIAM and BD.USER_HOLE_DIAM > 1 then
          EgtModifyArcRadius( AuxId, BD.USER_HOLE_DIAM / 2)
       end
    end
-   -- recupero diametro
+   -- recupero diametro e lunghezza
    local dDiam = EgtGetInfo( Proc.Id, 'P12', 'd') or 0
+   local dLen = abs( EgtCurveThickness( Proc.Id + AuxId)) or 0
    -- recupero faccia di entrata e uscita
    local nFcs = EgtGetInfo( Proc.Id, 'FCS', 'i') or 0
    local nFce = EgtGetInfo( Proc.Id, 'FCE', 'i') or 0
-   return dDiam, nFcs, nFce
+   return dDiam, dLen, nFcs, nFce
 end
 
 ---------------------------------------------------------------------
@@ -139,6 +141,77 @@ function ProcessDrill.Split( Proc, b3Raw)
    return ( bOpen and ( bHoriz or BD.ROT90 or BD.DOWN_HEAD or BD.TURN or bAngTransm) and not bSlant)
 end
 
+---------------------------------------------------------------------
+-- Verifica se bisogna aggiungere un preforo
+function ProcessDrill.IsPredrillNeeded( Proc)
+   local dDepthPredrill = EgtGetInfo( Proc.Id, 'Q03', 'i')
+   -- se non c'è la Q oppure se zero, allora non è da fare
+   if not dDepthPredrill or dDepthPredrill <= 0 then
+      return false
+   -- altrimenti Predrill da fare
+   else
+      return true
+   end
+end
+
+---------------------------------------------------------------------
+-- Aggiunge il preforo alla feature passata
+function ProcessDrill.AddPredrillFromDrillProc( Proc)
+   local dDepthPredrill = EgtGetInfo( Proc.Id, 'Q03', 'i')
+   -- foro più corto del preforo, allora è il foro che diventa il preforo stesso
+   if Proc.Len <= dDepthPredrill then
+      Proc.IsPredrill = true
+      Proc.IsPredrillOf = Proc.Id
+      return false
+   -- altrimenti creo un nuovo process
+   else
+      -- recupero gruppo per geometria aggiuntiva
+      local nAddGrpId = BL.GetAddGroup( Proc.PartId)
+      -- recupero e verifico l'entità foro
+      local AuxId = EgtGetInfo( Proc.Id, 'AUXID', 'i') or 0
+      local ptCen = EgtCP( Proc.Id + AuxId, GDB_RT.GLOB)
+      local vtExtr = EgtCurveExtrusion( Proc.Id + AuxId, GDB_RT.GLOB)
+
+      -- copio foro originale
+      local nPreHoleId = EgtCopyGlob( Proc.Id, nAddGrpId)
+      local nPreHoleAux = EgtCopyGlob( Proc.Id + AuxId, nAddGrpId)
+
+      -- se foro invertito sposto geometria dall'altro lato del foro
+      if Proc.Flg == -2 then
+         local vsExtr = vtExtr * Proc.Len
+         EgtMove( nPreHoleAux, vsExtr)
+         EgtModifyCurveThickness( nPreHoleAux, dDepthPredrill)
+      -- altrimenti creo il foro direttamente
+      else
+         EgtModifyCurveThickness( nPreHoleAux, -dDepthPredrill)
+      end
+
+      -- definisco dati seconda parte
+      local PredrillProc = {}
+      PredrillProc.PartId = Proc.PartId
+      PredrillProc.Id = nPreHoleId
+      PredrillProc.Grp = Proc.Grp
+      PredrillProc.Prc = Proc.Prc
+      PredrillProc.Flg = Proc.Flg
+      PredrillProc.Box = Proc.Box
+      PredrillProc.Fct = Proc.Fct
+      PredrillProc.Diam = Proc.Diam
+      PredrillProc.Len = dDepthPredrill
+      PredrillProc.Head = Proc.Head
+      PredrillProc.Tail = Proc.Tail
+      PredrillProc.Fcs = Proc.Fcs
+      PredrillProc.Fce = Proc.Fce
+      PredrillProc.CutId = Proc.CutId
+      PredrillProc.TaskId = Proc.TaskId
+      PredrillProc.AdjId = Proc.AdjId
+      PredrillProc.MainId = Proc.MainId
+      PredrillProc.IsPredrill = true
+      PredrillProc.IsPredrillOf = Proc.Id
+
+      return true, PredrillProc
+   end
+end
+
 ---------------------------------------------------------------------
 -- Classificazione della feature
 function ProcessDrill.Classify( Proc, b3Raw)
@@ -289,15 +362,15 @@ function ProcessDrill.Make( Proc, nPhase, nRawId, nPartId)
    local bDrillUp = ( bDownDrill and vtExtr:getZ() > -0.421)
    local bExcludeH2 = false
    if Proc.Double and Proc.Double > 0 then
-      bMillUp = true
+      -- bMillUp = true
       bDrillDown = false
       bExcludeH2 = true
    end
    -- primo gruppo di controlli con lunghezza utensile pari a metà foro se passante
    -- recupero la lavorazione
-   local sDrilling, sType, dMaxDepth, dMaxToolLength, dToolDiam, dDiamTh, dToolFreeLen = ML.FindDrilling( dDiam, dCheckDepth, bDrillUp, bDrillDown, bExcludeH2, bDrillAngTrasm)
+   local sDrilling, sType, dMaxDepth, dMaxToolLength, dToolDiam, dDiamTh, dToolFreeLen = ML.FindDrilling( dDiam, dCheckDepth, bDrillUp, bDrillDown, bExcludeH2, bDrillAngTrasm, Proc.IsPredrill)
    if not sDrilling and dCheckDepth then
-      sDrilling, sType, dMaxDepth, dMaxToolLength, dToolDiam, dDiamTh, dToolFreeLen = ML.FindDrilling( dDiam, 0, bDrillUp, bDrillDown, bExcludeH2, bDrillAngTrasm)
+      sDrilling, sType, dMaxDepth, dMaxToolLength, dToolDiam, dDiamTh, dToolFreeLen = ML.FindDrilling( dDiam, 0, bDrillUp, bDrillDown, bExcludeH2, bDrillAngTrasm, Proc.IsPredrill)
       if sDrilling then dCheckDepth = nil end
    end
    if not sDrilling then
@@ -454,7 +527,7 @@ function ProcessDrill.Make( Proc, nPhase, nRawId, nPartId)
       dMaxElev = dMaxDepth
    end
    -- inserisco la lavorazione
-   local sName = 'Drill_' .. ( EgtGetName( Proc.Id) or tostring( Proc.Id))
+   local sName = EgtIf( sType == 'Predrill', 'Predrill_', 'Drill_') .. ( EgtGetName( Proc.Id) or tostring( Proc.Id))
    local nMchId = EgtAddMachining( sName, sDrilling)
    if not nMchId then
       local sErr = 'Error adding machining ' .. sName .. '-' .. sDrilling
@@ -464,7 +537,7 @@ function ProcessDrill.Make( Proc, nPhase, nRawId, nPartId)
    -- aggiungo geometria
    EgtSetMachiningGeometry( {{ AuxId, -1}})
    -- eventuale inversione
-   if sType == 'Drill' or sType == 'Drill_H2' or sType == 'Drill_AT' or sType == 'AngleDrill' then
+   if sType == 'Drill' or sType == 'Drill_H2' or sType == 'Drill_AT' or sType == 'AngleDrill' or sType == 'Predrill' then
       EgtSetMachiningParam( MCH_MP.INVERT, bToInvert)
    else
       EgtSetMachiningParam( MCH_MP.TOOLINVERT, bToInvert)

LuaLibs/ProcessLapJoint.lua

@@ -1,4 +1,4 @@
--- ProcessLapJoint.lua by Egaltech s.r.l. 2023/09/26
+-- ProcessLapJoint.lua by Egaltech s.r.l. 2024/03/15
 -- Gestione calcolo mezzo-legno per Travi
 -- 2019/10/08 Agg. gestione OpenPocket.
 -- 2021/01/24 Con sega a catena ora sempre impostato asse A.
@@ -99,6 +99,7 @@
 -- 2024/02/29 In lapjoint 2 facce (TestTwoFacesDownHead) migliorata la scelta della lama da sotto.
 -- 2024/03/01 Migliorata VerifyPocket.
 -- 2024/03/04 Implementato attacco esterno se tasca 4 facce sulla coda ma nessun pezzo successivo.
+-- 2024/03/15 Correzione a calcolo ingombro per feature basse e lunghe dalla testa.
 
 -- Tabella per definizione modulo
 local ProcessLapJoint = {}
@@ -661,8 +662,10 @@ local function UpdateEncumbrance( Proc, nRawId, b3Raw, b3Solid)
       elseif Proc.Box:getCenter():getX() > b3Solid:getCenter():getX() then
          local dOffs = b3Solid:getMax():getX() - Proc.Box:getMin():getX()
          local dDist = b3Solid:getMax():getX() - Proc.Box:getMax():getX()
-         -- se concavo aumento la distanza (rimane una punta...)
-         --if dAngT < 0 then dDist = dDist + 10 end
+         -- se pinze a 45° e pinza abbastanza materiale, compenso comunque, ma solo inclinazione morse
+         if not bIsVertClamps and dDeltaZClamp > BD.VICE_MINH and BD.VICE_MAXH then
+            dOffs = min( dOffs, BD.VICE_MAXH - BD.VICE_MINH)
+         end
          BL.UpdateHCING( nRawId, dOffs, dDist)
       end
    end
@@ -5824,7 +5827,7 @@ local function TestTwoFacesDownHead( Proc)
       Proc.IsTopDownRabbet = abs( vtRes:getZ()) > 10 * GEO.EPS_SMALL
       for i = 1, Proc.Fct do
          Proc.Face[i].IsTooDownwardForTopBlade = Proc.Face[i].VtN:getZ() < ( BD.CUT_VZ_MIN or -0.484) - 10 * GEO.EPS_SMALL
-         Proc.Face[i].IsTooWideForTopBlade = Proc.Face[i].Width > dTopBladeMaxDepth
+         Proc.Face[i].IsTooWideForTopBlade = Proc.Face[i].WidthTrimmed > dTopBladeMaxDepth
       end
       -- serve la lama sotto se c'è almeno una faccia troppo inclinata verso il basso e non è un rabbet stretto lavorabile dal lato
       if not ( Proc.Face[1].IsTooDownwardForTopBlade or Proc.Face[2].IsTooDownwardForTopBlade) then

UpdateLog.txt

@@ -1,5 +1,19 @@
            ==== Beam Update Log ====
 
+Versione 2.6c3 (15/03/2024)
+- Added : Aggiunta gestione prefori
+
+Versione 2.6c2 (12/03/2024)
+- Added : in Mortase Aggiunta possibilità di inserire lavorazione di smusso
+- Added : in FreeContour aggiunto smusso se lav. di svuotatura
+- Added : in BeamExec creata funzione calcolo dipendenze tra feature
+- Added : In BeamExec -> CollectFeatures si scrive ora Width e Height della faccia sia trimmate con il grezzo che intere
+- Added : implementate le lavorazioni in doppio per fori specchiati non passanti e DrillPocket
+- Modif : in LapJoint migliorata ricerca pocket (VerifyPocket)
+- Modif : implementato attacco esterno se tasca 4 facce sulla coda ma nessun pezzo successivo
+- Modif : rimossi simboli di debug da compile
+- Fixed : In FreeContour corretto caso di smusso non passante
+
 Versione 2.6c1 (29/02/2024)
 - Modif : in FacesBySaw e LapJoint migliorato calcolo area non pinzabile in testa HCING e coda TCING
 - Modif : vari miglioramenti all'ordinamento delle lavorazioni

Version.lua

@@ -2,5 +2,5 @@
 -- Gestione della versione di Beam
 
 NAME = 'Beam'
-VERSION = '2.6c1'
+VERSION = '2.6c3'
 MIN_EXE = '2.6a1'