Merge branch 'Test_Tick#2925' into develop

- prime aggiunte per nuova gestione tipo robot di macchina con tre assi rotanti (Scm Oikos).

LuaLibs/BeamLib.lua

@@ -883,6 +883,25 @@ function BeamLib.GetBlockedAxis( sMachining, sBlockedAxis, b3Raw, vtTool, vtOut)
    return ''
 end
 
+---------------------------------------------------------------------
+function BeamLib.GetAuxDir( sMachining, sBlockedAxis, b3Raw, vtTool, vtOut)
+   -- informazioni sull'utensile della lavorazione
+   local nToolType, sHead
+   if EgtMdbSetCurrMachining( sMachining) then
+      local sTuuid = EgtMdbGetCurrMachiningParam( MCH_MP.TUUID)
+      if EgtTdbSetCurrTool( EgtTdbGetToolFromUUID( sTuuid) or '') then
+         nToolType = EgtTdbGetCurrToolParam( MCH_TP.TYPE)
+         sHead = EgtTdbGetCurrToolParam( MCH_TP.HEAD)
+      end
+   end
+   -- se presente funzione specifica nella macchina, la richiamo
+   if BD.GetAuxDir then
+      return BD.GetAuxDir( sHead, nToolType, sBlockedAxis, b3Raw, vtTool, vtOut)
+   end
+   -- niente
+   return nil
+end
+
 ---------------------------------------------------------------------
 -- Trova l'Ind (0 based) della faccia meglio orientata come l'asse vtAx. Restituisce anche vtN e ptC della faccia stessa. La faccia di indice (0 based) fctExclude non viene considerata nella ricerca.
 function BeamLib.FindFaceBestOrientedAsAxis( Proc, vtAx, fctExclude)

LuaLibs/FacesBySaw.lua

@@ -170,6 +170,12 @@ function MakeParallelOne( nSurfId, nFacet, sCutting, dSawDiam, nFaceUse, dVzLimD
    end
    local vtOut = EgtIf( vtN:getX() > 0, X_AX(), -X_AX())
    EgtSetMachiningParam( MCH_MP.BLOCKEDAXIS, BL.GetBlockedAxis( sCutting, 'perpendicular', b3Raw, vtTool, vtOut))
+   local sAuxDir, sInitAngs = BL.GetAuxDir( sCutting, 'perpendicular', b3Raw, vtTool, vtOut)
+   if sAuxDir then
+      sNotes = EgtSetValInNotes( sNotes, 'VtAuxDir', sAuxDir)
+      EgtSetMachiningParam( MCH_MP.INITANGS, sInitAngs)
+      EgtSetMachiningParam( MCH_MP.SCC, MCH_SCC.STD)
+   end
    -- eventuali note
    if ( sLeadInOutType == 'PerpendicularOutraw') then
       sNotes = EgtSetValInNotes( sNotes, 'OutRaw', 3)
@@ -631,6 +637,12 @@ function FacesBySaw.MakeOne( nSurfId, nFacet, sCutting, dSawDiam, Par5, dVzLimDw
    -- imposto angolo 3° asse rot
    local sBlockedAxis = EgtIf( bMaximizeVerticalDepth, 'parallel', 'perpendicular')
    EgtSetMachiningParam( MCH_MP.BLOCKEDAXIS, BL.GetBlockedAxis( sCutting, sBlockedAxis, b3Raw, vtN, vtOrthO))
+   local sAuxDir, sInitAngs = BL.GetAuxDir( sCutting, sBlockedAxis, b3Raw, vtN, vtOrthO)
+   if sAuxDir then
+      sNotes = EgtSetValInNotes( sNotes, 'VtAuxDir', sAuxDir)
+      EgtSetMachiningParam( MCH_MP.INITANGS, sInitAngs)
+      EgtSetMachiningParam( MCH_MP.SCC, MCH_SCC.STD)
+   end
    -- eventuali note
    if ( sLeadInOutType == 'PerpendicularOutraw') then
       sNotes = EgtSetValInNotes( sNotes, 'OutRaw', 3)

LuaLibs/ProcessLapJoint.lua

@@ -3408,7 +3408,9 @@ local function MakeByChainOrSaw( Proc, nPhase, nRawId, nPartId, nFacInd,
             bGoFromHead = false
          -- continuo di testa se fessura con tre facce o non è tunnel
          else
-            bGoFromHead = (( bIs3Faces and dMaxElev) or not bOrthoFaces)
+            bGoFromHead = (( bIs3Faces and ( dMaxElev 
+                           or ( Proc.Topology == 'Groove' and Proc.IsThrough and (Proc.AffectedFaces.Left or Proc.AffectedFaces.Right) and not Proc.IsParallel))) 
+                           or not bOrthoFaces)
          end
       end
       -- se continuo a lavorare di testa
@@ -3473,17 +3475,35 @@ local function MakeByChainOrSaw( Proc, nPhase, nRawId, nPartId, nFacInd,
             -- imposto offset radiale
             local dOffs = ( i - 1) * dStep
             EgtSetMachiningParam( MCH_MP.OFFSR, dOffs)
+            local bElevAdj
+            local dToolEntryAngle, _, _, dTanToolEntryAngle = GetToolEntryAngle( Proc, rfFac:getVersZ())
             -- se necessario, avverto limitazione dell'affondamento
-               if dElev > dMaxDepth + 10 * GEO.EPS_SMALL then
-               EgtSetMachiningParam( MCH_MP.DEPTH, dMaxDepth)
-               sWarn = 'Warning in LapJoint : elevation (' .. EgtNumToString( dElev, 1) .. ') bigger than max tool depth (' .. EgtNumToString( dMaxDepth, 1) .. ')'
-               EgtOutLog( sWarn)
+            if dElev > dMaxDepth + 10 * GEO.EPS_SMALL then
+               if Proc.Fct == 3 and Proc.Topology == 'Groove' and Proc.IsThrough and (Proc.AffectedFaces.Left or Proc.AffectedFaces.Right) and not Proc.IsParallel then
+                  local Edges = BL.GetEdgesInfo( Proc, Proc.Face[nFacAdj+1])
+                  local dWorkEdgeWidth
+                  for i = 1, #Edges do 
+                     if Edges[i].AdjacentFaceId == nFacInd then
+                        dWorkEdgeWidth = Edges[i].Length
+                        break
+                     end
+                  end
+                  local dDeltaDepth = dWorkEdgeWidth * cos( dToolEntryAngle)
+                  bElevAdj = true
+                  EgtSetMachiningParam( MCH_MP.DEPTH, dMaxDepth - dDeltaDepth)
+               else
+                  EgtSetMachiningParam( MCH_MP.DEPTH, dMaxDepth)
+                  sWarn = 'Warning in LapJoint : elevation (' .. EgtNumToString( dElev, 1) .. ') bigger than max tool depth (' .. EgtNumToString( dMaxDepth, 1) .. ')'
+                  EgtOutLog( sWarn)
+               end
+               
                --local dDepth = dMaxDepth - dElev
                --EgtSetMachiningParam( MCH_MP.DEPTH_STR, 'TH '..EgtNumToString( dDepth, 1))
             end
             -- imposto massima elevazione
             local sUserNotes = EgtGetMachiningParam( MCH_MP.USERNOTES) or ''
-            sUserNotes = EgtSetValInNotes( sUserNotes, 'MaxElev', EgtNumToString( dElev, 2))
+            local dElevAdj = EgtIf( bElevAdj, dElev / sin( dToolEntryAngle), dElev)
+            sUserNotes = EgtSetValInNotes( sUserNotes, 'MaxElev', EgtNumToString( dElevAdj, 2))
             EgtSetMachiningParam( MCH_MP.USERNOTES, sUserNotes)
             -- eseguo
             if not ML.ApplyMachining( true, false) then

Version.lua

@@ -2,5 +2,5 @@
 -- Gestione della versione di Beam
 
 NAME = 'Beam'
-VERSION = '3.1d2'
+VERSION = '3.1d3'
 MIN_EXE = '3.1b1'