diff --git a/LuaLibs/WProcessFreeContour.lua b/LuaLibs/WProcessFreeContour.lua index 8a22515..6a68dbe 100644 --- a/LuaLibs/WProcessFreeContour.lua +++ b/LuaLibs/WProcessFreeContour.lua @@ -1,4 +1,4 @@ --- ProcessFreeContour.lua by Egaltech s.r.l. 2021/03/23 +-- ProcessFreeContour.lua by Egaltech s.r.l. 2021/03/24 -- Gestione calcolo profilo libero per Pareti -- Tabella per definizione modulo @@ -1842,11 +1842,13 @@ local function MakeByPocket( Proc, nRawId, b3Raw) break end end - if nFacet then - local _, dH, dV = EgtSurfTmFacetMinAreaRectangle( Proc.Id, nFacet, GDB_ID.ROOT) - dDiam = min( dH, dV) - dElev = WL.GetFaceElevation( Proc.Id, nFacet, nRawId) + if not nFacet then + return MakeByCut( Proc, nRawId, b3Raw) end + -- dati della faccia di fondo + local _, dH, dV = EgtSurfTmFacetMinAreaRectangle( Proc.Id, nFacet, GDB_ID.ROOT) + dDiam = min( dH, dV) + dElev = WL.GetFaceElevation( Proc.Id, nFacet, nRawId) -- gruppo ausiliario local nAddGrpId = WL.GetAddGroup( Proc.PartId) local nNewProc, nNumFacet = RemoveBottomFaceAndReorder( Proc, nAddGrpId, nFacet) diff --git a/LuaLibs/WallExec.lua b/LuaLibs/WallExec.lua index 32e5755..31ef735 100644 --- a/LuaLibs/WallExec.lua +++ b/LuaLibs/WallExec.lua @@ -1,4 +1,4 @@ --- WallExec.lua by Egaltech s.r.l. 2021/03/23 +-- WallExec.lua by Egaltech s.r.l. 2021/03/24 -- Libreria esecuzione lavorazioni per Pareti -- Tabella per definizione modulo @@ -175,7 +175,7 @@ local function PrintFeatures( vProc) EgtOutLog( ' *** Feature List ***') for i = 1, #vProc do local Proc = vProc[i] - local sOut = string.format( ' Part=%3d Proc=%3d Grp=%1d Prc=%3d TC=%2d/%d Flg=%2d Fcse=%1d,%1d Diam=%.2f Fct=%2d Box=%s', + local sOut = string.format( 'Part=%3d Proc=%3d Grp=%1d Prc=%3d TC=%2d/%d Flg=%2d Fcse=%1d,%1d Diam=%.2f Fct=%2d Box=%s', Proc.PartId, Proc.Id, Proc.Grp, Proc.Prc, Proc.TaskId, Proc.CutId, Proc.Flg, Proc.Fcs, Proc.Fce, Proc.Diam, Proc.Fct, tostring( Proc.Box)) EgtOutLog( sOut) @@ -186,6 +186,7 @@ end local function AddFeatureMachining( Proc, nRawId, b3Raw) local bOk = true local sErr = '' + EgtOutLog( ' * Process ' .. tostring( Proc.Id) .. ' *', 1) -- se taglio (1/2-010-X) o taglio longitudinale (0/3/4-010-X) if Cut.Identify( Proc) then -- esecuzione taglio @@ -338,6 +339,7 @@ function WallExec.ProcessFeatures() if EgtGetDebugLevel() >= 1 then PrintFeatures( vProc) end + EgtOutLog( ' *** AddMachinings ***', 1) -- inserisco le lavorazioni for i = 1, #vProc do -- creo la lavorazione @@ -357,6 +359,7 @@ function WallExec.ProcessFeatures() table.insert( Stats, {Err=1, Msg=sMsg, Rot=0, CutId=Proc.CutId, TaskId=Proc.TaskId}) end end + EgtOutLog( ' *** End AddMachinings ***', 1) -- se macchina pareti if not WD.BEAM_MACHINE then -- riordino le lavorazioni tra tutti i pezzi