diff --git a/LuaLibs/Logs.lua b/LuaLibs/Logs.lua index c4ad6b1..c77da8a 100644 --- a/LuaLibs/Logs.lua +++ b/LuaLibs/Logs.lua @@ -13,7 +13,7 @@ function Logs.WriteFeaturesLog( ProcessingsOnPart, PartInfo, nReProcessCycles) nCycles = 2 end - EgtOutLog( ' === === === === === === === === === === REPRECESS CYCLES ' .. EgtNumToString( nReProcessCycles) .. ' === === === === === === === === === === === ===') + EgtOutLog( ' === === === === === === === === === === REPROCESS CYCLES ' .. EgtNumToString( nReProcessCycles) .. ' === === === === === === === === === === === ===') EgtOutLog( ' === === === === === === === === === === FEATURES STRATEGIES === === === === === === === === === === === ===') for nCycle = 1, nCycles do local nStartIndex = 1 + nOffsetIndex @@ -72,7 +72,11 @@ function Logs.WriteFeaturesLog( ProcessingsOnPart, PartInfo, nReProcessCycles) ProcessingsOnPart.Rotation[nRotLog][ProcLog].AvailableStrategies[nCountStrategies].Result.sStatus == 'Not-Applicable' then sStatusStrategy = 'N' sRating = '----' - sIndexes = ' (C:---|Q:---|T:---)' + if EgtStartsWith( ProcessingsOnPart.Rotation[nRotLog][ProcLog].AvailableStrategies[nCountStrategies].Result.sInfo, 'REJECTED') then + sIndexes = ' ( --- REJECTED ---)' + else + sIndexes = ' (C:---|Q:---|T:---)' + end else if ProcessingsOnPart.Rotation[nRotLog][ProcLog].AvailableStrategies[nCountStrategies].Result.sStatus == 'Completed' then sStatusStrategy = 'C' @@ -86,7 +90,7 @@ function Logs.WriteFeaturesLog( ProcessingsOnPart, PartInfo, nReProcessCycles) end -- se c'è una chosen strategy, si aggiunge prefisso '*' per indicare nel log qual è la strategia che è stata scelta local nIndexBestStrategy = ProcessingsOnPart.Rotation[nRotLog][ProcLog].nIndexBestStrategy or 0 - local sLogLineProc = EgtIf( nIndexBestStrategy == nCountStrategies, '*', '') .. sRating .. sIndexes .. ' (' .. + local sLogLineProc = EgtIf( nIndexBestStrategy == nCountStrategies, '*', '') .. sRating .. sIndexes .. ' (' .. tostring( ProcessingsOnPart.Rotation[nRotLog][ProcLog].AvailableStrategies[nCountStrategies].sStrategyId) .. ')' .. sStatusStrategy .. ' |' while string.len( sLogLineProc) <= 38 do diff --git a/LuaLibs/MachiningLib.lua b/LuaLibs/MachiningLib.lua index ae29562..76e1306 100644 --- a/LuaLibs/MachiningLib.lua +++ b/LuaLibs/MachiningLib.lua @@ -1364,6 +1364,7 @@ function MachiningLib.AddOperations( MACHININGS, Part, sRotation) local CurrProc = PROCESSINGS[MACHININGS[i].Proc.nIndexPartInParts].Rotation[MACHININGS[i].Proc.nIndexRotation][MACHININGS[i].Proc.nIndexInVProc] -- si annulla la feature scelta, in modo che un successivo ricalcolo non la tenga in considerazione CurrProc.AvailableStrategies[CurrProc.nIndexBestStrategy].Result.sStatus = 'Not-Applicable' + CurrProc.AvailableStrategies[CurrProc.nIndexBestStrategy].Result.sInfo = 'REJECTED (' .. sErr .. ')' CurrProc.ChosenStrategy= nil -- si verifica se vale la pena riprocessare tutto (perchè si pensa possa risolvere il problema) if IsReProcessWorthIt( nErr) then diff --git a/LuaLibs/PreSimulationLib.lua b/LuaLibs/PreSimulationLib.lua index b67a9b3..08b3588 100644 --- a/LuaLibs/PreSimulationLib.lua +++ b/LuaLibs/PreSimulationLib.lua @@ -232,7 +232,6 @@ end -- check extracorsa da punti sul tip dell'utensile function PreSimulationLib.CheckOutOfStrokeFromPoints( PointsOnToolTipCenter, vtHead, nSCC, Tool) - -- check collisione sui punti in centro lama su naso mandrino o aggregato. In base a direzione e punto for i = 1, #PointsOnToolTipCenter do local bOutOfStroke = CheckOutOfStrokePoint( PointsOnToolTipCenter[i], vtHead, nSCC, Tool)