Merge branch 'develop'

LuaLibs/ProcessLapJoint.lua

@@ -145,6 +145,7 @@ local Q_BLADE_ON_ALONG_FACE = '' -- i
 local Q_MAX_ELEVATION       = '' -- d
 local Q_SAW_PLUS_CHAIN      = '' -- i
 local Q_FORCE_CHAINSAW      = '' -- i
+local Q_CHAINSAW_FROM_SIDE  = '' -- i
 
 
 -- variabile smussi
@@ -3212,7 +3213,7 @@ local function MakeByChainOrSaw( Proc, nPhase, nRawId, nPartId, nFacInd,
          if vtRef and ( vtRef:getY() > 0.5 or vtRef:getZ() < -0.1) then
             vtRef = -vtRef
          end
-         if not ( Proc.Topology == 'Tunnel') then
+         if bAttackFromSide then
             dDimMin = min( Proc.Face[ nFacInd + 1].Width, Proc.Face[ nFacInd + 1].Height)
             dDimMax = min( Proc.Face[ nFacAdj + 1].Width, Proc.Face[ nFacAdj + 1].Height)
             nLundIdFace = nFacAdj
@@ -3262,7 +3263,7 @@ local function MakeByChainOrSaw( Proc, nPhase, nRawId, nPartId, nFacInd,
                local dOffs = ( i - 1) * dStep
                EgtSetMachiningParam( MCH_MP.OFFSR, dOffs)
                local dMachiningDepth = dDepth
-               if Proc.Topology == 'Tunnel' then
+               if not bAttackFromSide then
                   -- se possibile aumento l'affondamento pari al raggio corner + 1
                   if dMaxMat2 > ( dDepth + dSawCornerRad2 + 1) then
                      dMachiningDepth = ( dDepth + dSawCornerRad2 + 1)
@@ -3307,7 +3308,7 @@ local function MakeByChainOrSaw( Proc, nPhase, nRawId, nPartId, nFacInd,
                end
                -- in caso di attacco esterno si setta in modo da fare un primo step adeguato per evitare finecorsa
                -- si riduce la feed opportunamente
-               if not ( Proc.Topology == 'Tunnel') then
+               if bAttackFromSide then
                   local dMachiningStep = EgtGetMachiningParam( MCH_MP.STEP) or 0
                   -- TODO qui sostituire con valore preciso da GetSetupInfo
                   if BD.C_SIMM then
@@ -3328,7 +3329,7 @@ local function MakeByChainOrSaw( Proc, nPhase, nRawId, nPartId, nFacInd,
                   EgtSetMachiningParam( MCH_MP.FEED, dFeed)
                end
                local sNotes = 'MaxElev=' .. EgtNumToString( dElev, 1) .. ';'
-               if not ( Proc.Topology == 'Tunnel') then
+               if bAttackFromSide then
                   sNotes = EgtSetValInNotes( sNotes, 'Plunge', 10)
                end
                EgtSetMachiningParam( MCH_MP.USERNOTES, sNotes)