Merge branch 'develop' of https://gitlab.steamware.net/egalware-cadcam/lua/databeamnew into develop

BatchProcessNew.lua

@@ -211,7 +211,7 @@ elseif BEAM.FLAG == 10 then
 else
    sFlag = 'FLAG='..tostring( BEAM.FLAG)
 end
-local sLog = 'BatchProcess : ' .. BEAM.FILE .. ', ' .. BEAM.MACHINE .. ', ' .. sFlag
+local sLog = 'BatchProcess : ' .. BEAM.FILE .. ', ' .. ( BEAM.MACHINE or EgtGetCurrMachineName()) .. ', ' .. sFlag
 EgtOutLog( sLog)
 
 -- TODO forzatura calcolo con prerotazioni. Cancellare dopo che è stata aggiunta la gestione corretta

NestProcessNew.lua

@@ -435,6 +435,12 @@ if Step > 1 then
    NestSolutionFromSP( StartingResult, 1)
 end
 
+-- se esiste un MachGorup precedente
+local nPreviousNestIndex = 0
+local nLastMachGroupId = EgtGetLastMachGroup()
+if nLastMachGroupId then
+   nPreviousNestIndex = EgtGetInfo( nLastMachGroupId, "NestIndex", 'i')
+end
 for nMachineIndex = 1, #NEST.MACHINELIST do
    local sMachineName = NEST.MACHINELIST[nMachineIndex]
    -- imposto macchina corrente
@@ -444,12 +450,12 @@ for nMachineIndex = 1, #NEST.MACHINELIST do
    EgtRemoveBaseMachineDirFromPackagePath()
    EgtAddToPackagePath( sMachDir .. '\\Beam\\?.lua')
    -- creo gruppi di lavorazione per risultato
-   for MachGroupIndex = 1, #BestResult do
-      local CurrMachGroup = BestResult[ MachGroupIndex]
+   for nMachGroupIndex = 1, #BestResult do
+      local CurrMachGroup = BestResult[nMachGroupIndex]
       -- creo gruppo di lavorazione
       local MachGroupName = NewMachGroupName()
       nMachGroup = EgtAddMachGroup( MachGroupName)
-      EgtSetInfo( nMachGroup, "NestIndex", MachGroupIndex)
+      EgtSetInfo( nMachGroup, "NestIndex", nPreviousNestIndex + nMachGroupIndex)
       EgtSetInfo( nMachGroup, "BARLEN", CurrMachGroup.BarLen)
       EgtSetInfo( nMachGroup, "MATERIAL", NEST.MATERIAL)
       EgtSetInfo( nMachGroup, "AUTONEST", 1)