Merge branch 'develop' into CheckGenerateFix

BatchProcess.lua

@@ -59,9 +59,23 @@ end
 local sLog = 'BatchProcess : ' .. BEAM.FILE .. ', ' .. BEAM.MACHINE .. ', ' .. sFlag
 EgtOutLog( sLog)
 
--- Cancello file di log specifico
 local sLogFile = EgtChangePathExtension( BEAM.FILE, '.txt')
-EgtEraseFile( sLogFile) 
+-- in caso sia richiesta generazione senza check, verifico prima che il file log specifico non contenga errori: se sì, forzo il check
+if BEAM.FLAG == 0 then
+   local hLogFile = io.open( sLogFile, 'r')
+   if hLogFile then
+      for line in hLogFile:lines() do
+         if EgtStartsWith( line, 'ERR') and tonumber( EgtSplitString( line, '=')[2] or 0) > 0 then
+            BEAM.FLAG = 4
+            break
+         end
+      end
+      hLogFile:close()
+   end
+end
+
+-- Cancello file di log specifico
+EgtEraseFile( sLogFile)
 
 -- Funzioni per scrittura su file di log specifico
 local function WriteErrToLogFile( nErr, sMsg, nRot, nCutId, nTaskId)

BatchProcessNew.lua

@@ -45,9 +45,23 @@ end
 local sLog = 'BatchProcess : ' .. BEAM.FILE .. ', ' .. BEAM.MACHINE .. ', ' .. sFlag
 EgtOutLog( sLog)
 
--- Cancello file di log specifico
 local sLogFile = EgtChangePathExtension( BEAM.FILE, '.txt')
-EgtEraseFile( sLogFile) 
+-- in caso sia richiesta generazione senza check, verifico prima che il file log specifico non contenga errori: se sì, forzo il check
+if BEAM.FLAG == 0 then
+   local hLogFile = io.open( sLogFile, 'r')
+   if hLogFile then
+      for line in hLogFile:lines() do
+         if EgtStartsWith( line, 'ERR') and tonumber( EgtSplitString( line, '=')[2] or 0) > 0 then
+            BEAM.FLAG = 4
+            break
+         end
+      end
+      hLogFile:close()
+   end
+end
+
+-- Cancello file di log specifico
+EgtEraseFile( sLogFile)
 
 -- Funzioni per scrittura su file di log specifico
 local function WriteErrToLogFile( nErr, sMsg, nRot, nCutId, nTaskId)

LuaLibs/FacesBySaw.lua

@@ -29,6 +29,7 @@
 -- 2024/02/22 Migliorato calcolo area non pinzabile in testa HCING e coda TCING
 -- 2024/03/27 In MakeTwo rimossa gestione calcolo differente su ultima passata in caso di macchina FAST
 -- 2024/06/18 In MakeOne in caso di inversione del percorso, si scambia anche accorciamento start con end
+-- 2024/09/12 In MakeOne per settare il FaceUse si usa il versore nelle UserNotes
 
 -- Tabella per definizione modulo
 local FacesBySaw = {}
@@ -232,8 +233,8 @@ function FacesBySaw.MakeOne( nSurfId, nFacet, sCutting, dSawDiam, Par5, dVzLimDw
    if not dVzLimDwnUp then dVzLimDwnUp = BL.GetNzLimDownUp( b3Raw, vtN, vtOrthO) end
    local bDownHead = ( dVzLimDwnUp and dVzLimDwnUp < - 1.5)
    local bDownUp = ( vtN:getZ() < dVzLimDwnUp)
-   -- linea o bilinea di lavorazione (qui uso nOrthoOpposite per ripetere esattamente il calcolo del Mach)
-   local ptP1, ptPm, ptP2, vtV1, vtV2, dLen, dWidth = EgtSurfTmFacetOppositeSide( nSurfId, nFacet, BL.GetVersRef( nOrthoOpposite), GDB_ID.ROOT)
+   -- linea o bilinea di lavorazione
+   local ptP1, ptPm, ptP2, vtV1, vtV2, dLen, dWidth = EgtSurfTmFacetOppositeSide( nSurfId, nFacet, vtOrthO, GDB_ID.ROOT)
    if not dLen or dLen < 1.1 or not dWidth or dWidth < 1.1 then
       local sWarn = 'Face ' .. string.format( '%d,%d', nSurfId, nFacet) .. ' skipped : too small'
       EgtOutLog( sWarn, 1)
@@ -260,7 +261,7 @@ function FacesBySaw.MakeOne( nSurfId, nFacet, sCutting, dSawDiam, Par5, dVzLimDw
                nOrthoOpposite = nOrthoOppositeAlternative
                vtOrthO = vtOrthOAlternative
                -- avendo riassegnato la direzione di lavoro, i dati della linea vanno ricalcolati
-               ptP1, ptPm, ptP2, vtV1, vtV2, dLen, dWidth = EgtSurfTmFacetOppositeSide( nSurfId, nFacet, BL.GetVersRef( nOrthoOpposite), GDB_ID.ROOT)
+               ptP1, ptPm, ptP2, vtV1, vtV2, dLen, dWidth = EgtSurfTmFacetOppositeSide( nSurfId, nFacet, vtOrthO, GDB_ID.ROOT)
                if not dLen or dLen < 1.1 or not dWidth or dWidth < 1.1 then
                   local sWarn = 'Face ' .. string.format( '%d,%d', nSurfId, nFacet) .. ' skipped : too small'
                   EgtOutLog( sWarn, 1)
@@ -283,7 +284,10 @@ function FacesBySaw.MakeOne( nSurfId, nFacet, sCutting, dSawDiam, Par5, dVzLimDw
    if bInvert then
       ptP1, ptP2 = ptP2, ptP1
       vtV1, vtV2 = vtV2, vtV1
-      dAccStart, dAccEnd = dAccEnd, dAccStart
+      -- se l'inversione è forzata dall'esterno, anche gli accorciamenti che arrivano dall'esterno si prendono per buoni
+      if bForceInvert == nil then
+         dAccStart, dAccEnd = dAccEnd, dAccStart
+      end
    end
    local vtTg = ptP2 - ptP1 ;   vtTg:normalize()
    local dAllStart = 0
@@ -512,6 +516,8 @@ function FacesBySaw.MakeOne( nSurfId, nFacet, sCutting, dSawDiam, Par5, dVzLimDw
    EgtSetMachiningGeometry( {{ nSurfId, nFacet}})
    -- imposto uso faccia
    EgtSetMachiningParam( MCH_MP.FACEUSE, nFaceUse)
+   local sNoteVtFaceUse = 'VtFaceUse=' .. EgtNumToString( vtOrthO:getX(),3) .. ',' .. EgtNumToString( vtOrthO:getY(),3) .. ',' .. EgtNumToString( vtOrthO:getZ(),3) .. ';'
+   EgtSetMachiningParam( MCH_MP.USERNOTES, sNoteVtFaceUse)
    -- imposto posizione braccio porta testa
    EgtSetMachiningParam( MCH_MP.SCC, nSCC)
    -- imposto inversione e lato correzione

LuaLibs/ProcessHeadCut.lua

@@ -252,7 +252,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCut
                if not bOk then return false, sErr end
             end
             -- taglio verticale
-            local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutXOffset, dAccStart, dAccEnd, '', b3Raw)
+            local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutXOffset, dAccStart, dAccEnd, '', b3Raw, true)
             if not bOk then return bOk, sErr end
          end
          return true, sWarn
@@ -290,7 +290,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, HeadCut
          if i == 1 and HeadCutType.sType =='Precut' then
             dCutOffset = dStartOffset
          end
-         local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, '', b3Raw)
+         local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, '', b3Raw, true)
          if not bOk then return false, sErr end
       end
    -- altrimenti necessari tagli da sopra e sotto con testa opportuna

LuaLibs/ProcessSplit.lua

@@ -438,7 +438,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, TailCut
             if i == 1 and TailCutType.sType ~= 'Precut' then
                sInfo = 'Cut'
             end
-            local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutXOffset, dAccStart, dAccEnd, sInfo, b3Raw)
+            local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutXOffset, dAccStart, dAccEnd, sInfo, b3Raw, true)
             if not bOk then return false, sErr end
          end
          return true, sWarn
@@ -488,7 +488,7 @@ local function MakeStandardCuts( Proc, b3Raw, nCuts, dOffsetBetweenCuts, TailCut
          if i == nCuts and TailCutType.bHorizCut and BD.C_SIMM and not BD.DOWN_HEAD then
             sNotes = EgtSetValInNotes( sNotes, 'StartZmax', 2)
          end
-         local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, sNotes, b3Raw)
+         local bOk, sErr = Fbs.MakeOne( Proc.Id, 0, Cutting1Data.sCutting, Cutting1Data.dSawDiam, nOrthoOpposite, nil, dCutExtra, BD.CUT_SIC, dCutOffset, dAccStart, dAccEnd, sNotes, b3Raw, true)
          if not bOk then return false, sErr end
       end
    -- altrimenti necessari tagli da sopra e sotto con testa opportuna