Merge branch 'release/2.5c5'

- In LapJoint -> MakeByMill gestito correttamente il caso di Workside destro

.gitlab-ci.yml

@@ -2,7 +2,7 @@ variables:
  VERS_MAIN: '1.0'
  APP_NAME: 'Wall'
  NEW_REL: ''
- NET_SHARE_R: '\\10.74.82.201\EgwTech'
+ NET_SHARE_X: '\\10.74.82.201\EgwTech'
  NET_SHARE_Z: '\\10.74.82.201\Artifacts'
  NET_USERQ: 'steamw\egalware'
 
@@ -34,29 +34,32 @@ variables:
       echo "lua54 -o bin\LuaLibs\$FileName LuaLibs\$FileName"
     }
 
-# helper copia SORGENTI verso cartella di rete R:\ dei SORGENTI
+# helper copia SORGENTI verso cartella di rete X:\ dei SORGENTI
 .CodeReplicaR: &CodeReplicaR
   - |
-    net use R: /delete
-    net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
-    ROBOCOPY . R:\EgtData\$env:APP_NAME /MIR /XF .git* /XD .git
+    net use X: /delete
     SLEEP 2
-    net use R: /delete
+    net use X: $env:NET_SHARE_X /u:$env:NET_USERQ $ZDRIVE_PASSWD
+    ROBOCOPY . X:\EgtData\$env:APP_NAME /MIR /XF .git* /XD .git
+    SLEEP 2
+    net use X: /delete
 
-# helper copia script verso cartella di rete R:\ delle cartelle bin
+# helper copia script verso cartella di rete X:\ delle cartelle bin
 .ReplicaR: &ReplicaR
   - |
-    net use R: /delete
-    net use R: $env:NET_SHARE_R /u:$env:NET_USERQ $ZDRIVE_PASSWD
-    ROBOCOPY /MIR bin R:\EgtData\$env:APP_NAME\bin
-    ROBOCOPY /MIR Images R:\EgtData\$env:APP_NAME\bin\Images
+    net use X: /delete
     SLEEP 2
-    net use R: /delete
+    net use X: $env:NET_SHARE_X /u:$env:NET_USERQ $ZDRIVE_PASSWD
+    ROBOCOPY /MIR bin X:\EgtData\$env:APP_NAME\bin
+    ROBOCOPY /MIR Images X:\EgtData\$env:APP_NAME\bin\Images
+    SLEEP 2
+    net use X: /delete
 
-# helper copia script verso cartella di rete R:\ delle cartelle bin
+# helper copia script verso cartella di rete X:\ delle cartelle bin
 .ReplicaZ: &ReplicaZ
   - |
     net use Z: /delete
+    SLEEP 2
     net use Z: $env:NET_SHARE_Z /u:$env:NET_USERQ $ZDRIVE_PASSWD
     ROBOCOPY /MIR bin Z:\EgtData\$env:APP_NAME\bin
     ROBOCOPY /MIR Images Z:\EgtData\$env:APP_NAME\bin\Images

LuaLibs/WMachiningLib.lua

@@ -3,6 +3,7 @@
 
 -- Tabella per definizione modulo
 -- 2023/03/09 Piccola correzione alla SideDepth in FindMilling
+--            In FindMilling aggiunta gestione spessore e massimo materiale nel caso di lam
 local WMachiningLib = {}
 
 -- Include
@@ -56,14 +57,15 @@ function WMachiningLib.FindMilling( sType, dDepth, sTuuid, nTool_ID, dMaxDiam, d
    for i = 1, #Millings do
       local Milling = Millings[i]
       if Milling.On and Milling.Type == sType and SetCurrMachiningAndTool( Milling.Name) then
+         local bIsBlade = ( EgtTdbGetCurrToolParam( MCH_TP.TYPE) & MCH_TF.SAWBLADE ~= 0) or false
          local nMchType = EgtMdbGetCurrMachiningParam( MCH_MP.TYPE)
          local sMyTuuid = EgtMdbGetCurrMachiningParam( MCH_MP.TUUID)
-         local dTMaxMat = EgtTdbGetCurrToolParam( MCH_TP.MAXMAT)
+         local dTMaxMat = EgtIf( bIsBlade, EgtTdbGetCurrToolParam( MCH_TP.THICK), EgtTdbGetCurrToolParam( MCH_TP.MAXMAT))
          local dTMaxDepth = EgtIf( WD.MILL_MAX_DEPTH_AS_MAT, dTMaxMat, EgtTdbGetCurrToolMaxDepth())
          local dTDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM)
          local dTDiamTh = EgtTdbGetCurrToolThDiam() or 0
          local dTTipFeed = EgtTdbGetCurrToolParam( MCH_TP.TIPFEED)
-         local dTMaxDepthOnSide = min( EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'SIDEDEPTH', 'd') or 999, 0.5 * ( dTDiam - dTDiamTh))
+         local dTMaxDepthOnSide = EgtIf( bIsBlade, EgtTdbGetCurrToolParam( MCH_TP.MAXMAT), min( EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'SIDEDEPTH', 'd') or 999, 0.5 * ( dTDiam - dTDiamTh)))
          local nMyTool_ID = EgtTdbGetCurrToolValInNotes( MCH_TP.USERNOTES, 'Tool_ID', 'i')
          if nMchType == MCH_MY.MILLING and
             ( not sTuuid or sTuuid == sMyTuuid) and

LuaLibs/WProcessLapJoint.lua

@@ -15,6 +15,8 @@
 -- 2022/12/01 Per 2 facce con angolo > 90° implementata lavorazione principale verticale. Se da sopra, aggiunta ripresa del lato inclinato.
 -- 2022/12/14 Nel caso di 2 facce piccola correzione al modo di ordinare le facce.
 -- 2023/03/09 Gestito caso riconoscimento errato Stype 3
+-- 2023/03/09 In MakeMoreFaces aggiunta la possibilità di lavorare le fessure con la lama
+-- 2023/03/17 In MakeByMill gestito correttamente il caso di Workside destro.
 
 -- Tabella per definizione modulo
 local WPL = {}
@@ -1380,6 +1382,13 @@ local function MakeByMill( Proc, nFacet, nOthFac, nRawId, b3Raw, dSideDist)
    EgtSetMachiningParam( MCH_MP.ENDADDLEN, 0)     -- -dMillDiam/2 + dAddLen)
    EgtSetMachiningParam( MCH_MP.LOTANG, 0)
    EgtSetMachiningParam( MCH_MP.LOPERP, dSideDist + WD.CUT_SIC)
+   -- setto inversione in base al workside
+   local bIsWorkSideRight = ( EgtGetMachiningParam( MCH_MP.WORKSIDE) == MCH_MILL_WS.RIGHT)
+   local bInvert = false
+   if bIsWorkSideRight then
+      bInvert = true
+   end
+   EgtSetMachiningParam( MCH_MP.INVERT, bInvert)
    -- imposto posizione braccio porta testa
    local nSCC = MCH_SCC.ADIR_ZP
    if AreSameOrOppositeVectorApprox( vtN, Z_AX()) then
@@ -2546,15 +2555,17 @@ local function MakeMoreFaces( Proc, nRawId, b3Raw)
       end
       local vtN = EgtSurfTmFacetNormVersor( Proc.Id, nFacInd, GDB_ID.ROOT)
       local _, dH, dV = EgtSurfTmFacetMinAreaRectangle( Proc.Id, nFacInd, GDB_ID.ROOT)
+      local dMaxSlotThicknessForBlade = 25
+      local bIsSmallSlot = ( Proc.Fct == 3 and ( min( dH, dV) < dMaxSlotThicknessForBlade + 10 * GEO.EPS_SMALL) and vtN:getZ() > -0.01)
       -- se di fianco
-      if not bPckt and Proc.Fct >= 3 and vtN:getZ() < WD.NZ_MINA then
+      if not bPckt and Proc.Fct >= 3 and ( ( vtN:getZ() < WD.NZ_MINA) or bIsSmallSlot) then
          -- recupero elevazione faccia in feature
          local dSideElev = WL.GetFaceElevation( Proc.Id, nFacInd)
          -- se abilitata lavorazione ribasso con fresa di fianco e parametro Q03 abilitato
          local sMillOnSide, dTMaxDepth, dMaxMat, dDiam = WM.FindMilling( 'SideMill', nil, nil, nil, nil, min( dH, dV), nil, dSideElev)
          local _, nUseMillOnSide = EvaluateQParam( Proc)
          -- se ho abilitata lavorazione di fresa di fianco
-         if Proc.Fct >= 3 and sMillOnSide and nUseMillOnSide >= 1 then
+         if Proc.Fct >= 3 and sMillOnSide and nUseMillOnSide >= 1 and not bIsSmallSlot then
             -- cerco nei parametri utensili la nota di affondamento di fianco SIDEDEPTH
             local dMaxDepthOnSide = 0
             local dMillDiam = 0
@@ -2596,15 +2607,17 @@ local function MakeMoreFaces( Proc, nRawId, b3Raw)
             end
          else
             -- fresatura (se definita)
-            local sMilling = WM.FindMilling( 'SideGroove')
+            local sMilling = WM.FindMilling( 'SideGroove', nil, nil, nil, nil, min( dH, dV))
             -- recupero i dati dell'utensile
             local dMaxMat = 1000
             local dMaxDepthOnSide = 0
+            local bIsBlade = false
             if sMilling and EgtMdbSetCurrMachining( sMilling) then
                local sTuuid = EgtMdbGetCurrMachiningParam( MCH_MP.TUUID)
                if EgtTdbSetCurrTool( EgtTdbGetToolFromUUID( sTuuid) or '') then
                   local dMillDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM) or dMillDiam
-                  if ( EgtTdbGetCurrToolParam( MCH_TP.TYPE) & MCH_TF.SAWBLADE) ~= 0 then
+                  bIsBlade = EgtTdbGetCurrToolParam( MCH_TP.TYPE) & MCH_TF.SAWBLADE ~= 0
+                  if bIsBlade then
                      dMaxMat = EgtTdbGetCurrToolParam( MCH_TP.THICK) or dMaxMat
                      dMaxDepthOnSide = EgtTdbGetCurrToolParam( MCH_TP.MAXMAT)
                   else
@@ -2617,12 +2630,12 @@ local function MakeMoreFaces( Proc, nRawId, b3Raw)
                   end
                end
             end
-            if sMilling and dElev < dMaxDepthOnSide and dMaxMat <= min( dH, dV) + 20 * GEO.EPS_SMALL then
-               return MakeSideGrooveByMill( Proc, nFacInd, nRawId, b3Raw, sMilling)
-            -- altrimenti sega a catena
-            else
-               return MakeByChainSaw( Proc, nFacInd, nRawId, b3Raw, dElev, dH, dV)
-            end
+               if sMilling and dElev < dMaxDepthOnSide then
+                  return MakeSideGrooveByMill( Proc, nFacInd, nRawId, b3Raw, sMilling)
+               -- altrimenti sega a catena
+               else
+                  return MakeByChainSaw( Proc, nFacInd, nRawId, b3Raw, dElev, dH, dV)
+               end
          end
       end
       local nFacet = EgtIf( bPckt or vtN:getZ() >= WD.NZ_MINA, nFacInd, nFacInd2)

Version.lua

@@ -1,4 +1,6 @@
 -- Version.lua by Egalware s.r.l. 2023/03/08
 -- Gestione della versione di Wall
 
-VERSION = '2.5c4'
+NAME = 'Wall'
+VERSION = '2.5c5'
+MIN_EXE = '2.5b3'