Merge branch 'develop' into Test_Ticket#2842

3.1c1

LuaLibs/ProcessDrill.lua

@@ -37,6 +37,7 @@ EgtOutLog( ' ProcessDrill started', 1)
 -- Dati
 local BD = require( 'BeamData')
 local ML = require( 'MachiningLib')
+local FreeContour = require( 'ProcessFreeContour')
 
 ---------------------------------------------------------------------
 -- Riconoscimento della feature
@@ -345,8 +346,6 @@ end
 function ProcessDrill.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
    -- Se forzato contorno foro forzo richiamo a FreeContour e uscita dalla funzione
    if EgtGetInfo( Proc.Id, 'Q04', 'i') == 1 then
-      _G.package.loaded.ProcessFreeContour = nil
-      local FreeContour = require( 'ProcessFreeContour')
       return FreeContour.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
    end
    -- default per costanti
@@ -717,23 +716,41 @@ function ProcessDrill.Make( Proc, nPhase, nRawId, nPartId, dCurrOvmH)
       else
          -- se DrillPocket passante in doppio si fa lavorazione aggiuntiva dell'ultimo step
          if Proc.Double and Proc.Double > 0 and ( sType == 'Pocket_AT' or sType == 'Pocket') and bOpen then
-            local nAddGrpId = BL.GetAddGroup( Proc.PartId)
-            local idProcLastStep = EgtCopyGlob( Proc.Id, nAddGrpId)
-            local idAuxIdLastStep = EgtCopyGlob( AuxId, nAddGrpId)
-            EgtModifyCurveThickness( idAuxIdLastStep, -dLastStepDepth)
-            local ProcLastStep = BL.TableCopyDeep( Proc)
-            ProcLastStep.Id = idProcLastStep
-            ProcLastStep.Flg = 1
-            ProcLastStep.Double = 0
-            ProcLastStep.dCustomMaxElev = dLastStepDepth - dDepth
-            local bOkLastStep, sWarnLastStep = ProcessDrill.Make( ProcLastStep, nPhase, nRawId, nPartId)
-            if not bOkLastStep then
-               sWarnLastStep = 'Drillpocket double : incomplete, last step missing'
+            local idMachiningLastStep = EgtCopyMachining( EgtIf( EgtStartsWith( sType, 'Predrill'), 'Predrill_', 'Drill_') .. ( EgtGetName( Proc.Id) or tostring( Proc.Id)), sName)
+            EgtSetCurrMachining( idMachiningLastStep)
+            if dLastStepDepth  > dMaxDepth + 10 * GEO.EPS_SMALL then
+               sMyWarn = 'Warning in drill pocket last step: depth (' .. EgtNumToString( dLastStepDepth, 1) .. ') bigger than max tool depth (' .. EgtNumToString( dMaxDepth, 1) .. ')'
+               dLastStepDepth = dMaxDepth
             end
-            local sPreviousWarn = sMyWarn or sWarn
-            if sWarnLastStep then
-               if not sPreviousWarn then sPreviousWarn = '' end
-               sMyWarn = EgtIf( #sPreviousWarn > 0, sPreviousWarn .. '\n' .. sWarnLastStep, sWarnLastStep)
+            local dMaxElevLastStep = dLastStepDepth - dDepth
+            sUserNotes = EgtSetValInNotes( sUserNotes, 'MaxElev', EgtNumToString( dMaxElevLastStep, 1))
+            EgtSetMachiningParam( MCH_MP.DEPTH, dLastStepDepth)
+            sUserNotes = EgtSetValInNotes( sUserNotes, 'DOUBLE', '')
+            sUserNotes = EgtSetValInNotes( sUserNotes, 'StartZmax', '')
+            EgtSetMachiningParam( MCH_MP.USERNOTES, sUserNotes)
+            local bOkLastStep = ML.ApplyMachining( true, false)
+            if not bOkLastStep and bDownDrill and bOpen and abs( Proc.Flg) == 1 then
+               if sType == 'Drill' or sType == 'Drill_H2' or sType == 'AngleDrill' then
+                  EgtSetMachiningParam( MCH_MP.INVERT, true)
+               else
+                  EgtSetMachiningParam( MCH_MP.TOOLINVERT, true)
+               end
+               bOkLastStep = ML.ApplyMachining( true, false)
+            end
+            if not bOkLastStep then
+               local _, sErr = EgtGetLastMachMgrError()
+               EgtSetOperationMode( nMchId, false)
+               return false, sErr
+            else
+               local _, sWarnLastStep = EgtGetMachMgrWarning( 0)
+               if not bOkLastStep then
+                  sWarnLastStep = 'Drillpocket double : incomplete, last step missing'
+               end
+               local sPreviousWarn = sMyWarn or sWarn
+               if sWarnLastStep then
+                  if not sPreviousWarn then sPreviousWarn = '' end
+                  sMyWarn = EgtIf( #sPreviousWarn > 0, sPreviousWarn .. '\n' .. sWarnLastStep, sWarnLastStep)
+               end
             end
          end
          return true, ( sMyWarn or sWarn)

LuaLibs/ProcessLapJoint.lua

@@ -7486,6 +7486,10 @@ local function MakeMoreFaces( Proc, nPhase, nRawId, nPartId, dOvmHead, bSinglePa
                      if ( bTrySidePocketAtFirst and Proc.Fct == 3 and bIsU) or bForceSideMill then
                         -- lavoro con svuotature (singola o doppia contrapposta)
                         local sMyMchFind = EgtIf( bForceSideMill, 'OpenPocket', 'Pocket')
+                        if Proc.TopologyLongName == 'Groove-Through-RightAngles-Parallel-3'
+                           or Proc.TopologyLongName == 'Rabbet-Through-RightAngles-Parallel-2' then
+                           sMyMchFind = 'OpenPocket'
+                        end
                         local dDiamTool = 100
                         local nPathInt, nSurfInt, bOneShot, nFirstMachId
                         local bIs3Faces = true

LuaLibs/ProcessLongDoubleCut.lua

@@ -1151,7 +1151,7 @@ function ProcessLong2Cut.Make( Proc, nPhase, nRawId, nPartId, bForcedBladeMaster
       end
       -- recupero la lavorazione
       local sMilling
-      local bDownHead = ( nSide == -1 and BD.DOWN_HEAD)
+      local bDownHead = ( BD.DOWN_HEAD and ( nSide == -1 or AreSameVectorApprox( vtN[vOrd[1]], -Z_AX())))
       sMilling = ML.FindMilling( 'Long2Cut', dElev, nil, nil, nil, not bDownHead, bDownHead)
 
       if not sMilling then
@@ -1277,31 +1277,35 @@ function ProcessLong2Cut.Make( Proc, nPhase, nRawId, nPartId, bForcedBladeMaster
       local dLimitAngle = -0.5 - 20 * GEO.EPS_SMALL
       -- se facce ortogonali (concave), mantengo la lavorazione di testa sulla faccia più grande purchè non superi di 30 gradi il sottosquadra
       if bOrtho then
-         local vtN1 = vtN[vOrd[1]]
-         local vtN2 = vtN[vOrd[2]]
-         if vtN1:getZ() > 0.001 and vtN2:getZ() > 0.001 then
-            if vtN1:getZ() >= vtN2:getZ() then
-               nFin = 1
-            else
-               nIni = 2
-            end
+         if bDownHead and AreSameVectorApprox( vtN[vOrd[1]], -Z_AX()) then
+            nFin = 1
          else
-            if vtN1:getZ() < dLimitAngle then
-               nIni = 2
-            elseif vtN2:getZ() < dLimitAngle then
-               nFin = 1
-            else
+            local vtN1 = vtN[vOrd[1]]
+            local vtN2 = vtN[vOrd[2]]
+            if vtN1:getZ() > 0.001 and vtN2:getZ() > 0.001 then
                if vtN1:getZ() >= vtN2:getZ() then
-                  if vtN1:getZ() < dLimitAngle then
-                     nIni = 2
-                  else
-                     nFin = 1
-                  end
+                  nFin = 1
                else
-                  if vtN1:getZ() < dLimitAngle then
-                     nIni = 2
+                  nIni = 2
+               end
+            else
+               if vtN1:getZ() < dLimitAngle then
+                  nIni = 2
+               elseif vtN2:getZ() < dLimitAngle then
+                  nFin = 1
+               else
+                  if vtN1:getZ() >= vtN2:getZ() then
+                     if vtN1:getZ() < dLimitAngle then
+                        nIni = 2
+                     else
+                        nFin = 1
+                     end
                   else
-                     nFin = 1
+                     if vtN1:getZ() < dLimitAngle then
+                        nIni = 2
+                     else
+                        nFin = 1
+                     end
                   end
                end
             end
@@ -1325,7 +1329,7 @@ function ProcessLong2Cut.Make( Proc, nPhase, nRawId, nPartId, bForcedBladeMaster
             -- valore sovrapposizione tra passate con fresa di fianco
             local dOverLapExtend = 2
             -- Verifico se da fare di fianco perchè normale troppo verso il basso (minore di -30deg)
-            local bSide = ( vtN[vOrd[i]]:getZ() < dLimitAngle and not ( nSide == -1 and ( BD.DOWN_HEAD or BD.TURN)))
+            local bSide = ( vtN[vOrd[i]]:getZ() < dLimitAngle and not ( bDownHead or ( nSide == -1 and ( BD.DOWN_HEAD or BD.TURN))))
             -- Limitazioni della lavorazione
             local nPos = EgtIf( i == 1, j, nC - j + 1)
             local dSal = EgtIf( nPos == 1, - EgtIf( i == nIni, dStartDist, dEndDist), - EgtIf( i == nIni, dStartAccDist, dEndAccDist) - ( nPos - 2) * dC + EgtIf( bSide, dOverLapExtend, 0))
@@ -1470,7 +1474,7 @@ function ProcessLong2Cut.Make( Proc, nPhase, nRawId, nPartId, bForcedBladeMaster
             end
          end
       end
-      if not Proc.bMoveAfterSplit and not bConvex and Proc.AffectedFaces.Left then
+      if not Proc.bMoveAfterSplit and not bConvex and Proc.AffectedFaces.Left and Proc.DistanceToNextPart < ( dToolDiam / 2 + 5) then
          -- recupero gruppo per geometria addizionale
          local nAddGrpId = BL.GetAddGroup( nPartId)
          if not nAddGrpId then
@@ -1503,8 +1507,8 @@ function ProcessLong2Cut.Make( Proc, nPhase, nRawId, nPartId, bForcedBladeMaster
          sMilling = ML.FindMilling( sMchType)
          sPrefix = 'L2CS_'
          nExtendMach = nUseMillOnSide
-         if nUseMillOnSide == 2 then 
-            bRemoveToolRadius = true 
+         if nUseMillOnSide == 2 then
+            bRemoveToolRadius = true
          end
          -- se testa da sotto
          if nSide ~= 1 and BD.DOWN_HEAD then

LuaLibs/ProcessSplit.lua

@@ -834,7 +834,7 @@ function ProcessSplit.Make( Proc, nPhase, nRawId, nPartId, nOrd, sDownOrSideOrSt
          -- determinazione materiale da asportare
          local dSawThickCheck = dSawThick
          if dSawThick2 > 0 and bDoubleHorizCut then
-            dSawThickCheck = min( dSawThick, dSawThick2)
+            dSawThickCheck = max( min( dSawThick, dSawThick2), dOvmTail)
          end
          local dMaxElev = 0
          if vtN:getX() > 0 then