diff --git a/LuaLibs/WProcessFreeContour.lua b/LuaLibs/WProcessFreeContour.lua index 510950e..5db1a01 100644 --- a/LuaLibs/WProcessFreeContour.lua +++ b/LuaLibs/WProcessFreeContour.lua @@ -1,4 +1,4 @@ --- ProcessFreeContour.lua by Egaltech s.r.l. 2021/01/19 +-- ProcessFreeContour.lua by Egaltech s.r.l. 2021/01/20 -- Gestione calcolo profilo libero per Pareti -- Tabella per definizione modulo @@ -847,7 +847,7 @@ local function AddMillCornerMachining( nNewProc, nFacInd, tFacAdj, nTypeConeCut, return false, sErr end -- se flag lavorazione spessore passante setto la nota per spostarla dopo i tagli di lama - if bThruThick then + if bThruThick and nTypeConeCut == 1 then EgtSetInfo( nMchId, 'MOVE_AFTER', 1) end -- aggiungo geometria @@ -916,15 +916,19 @@ local function AddMillCorner( nTypeConeCut, vFace, Proc, nRawId, b3Raw, local dMillDiamTh = 20 local dToolLength = 20 local dThickTool = 20 + local dSideAng = 0 if EgtMdbSetCurrMachining( sMilling) then local sTuuid = EgtMdbGetCurrMachiningParam( MCH_MP.TUUID) if EgtTdbSetCurrTool( EgtTdbGetToolFromUUID( sTuuid) or '') then dMillDiamTh = EgtTdbGetCurrToolThDiam() or dMillDiamTh dMillTotDiam = EgtTdbGetCurrToolParam( MCH_TP.TOTDIAM) or dMillTotDiam + dSideAng = EgtTdbGetCurrToolParam( MCH_TP.SIDEANG) or dSideAng dMillDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM) or dMillDiam dThickTool = EgtTdbGetCurrToolParam( MCH_TP.THICK) or dThickTool dToolLength = EgtTdbGetCurrToolParam( MCH_TP.LEN) or dToolLength dMaxDepth = EgtTdbGetCurrToolMaxDepth() or dMaxDepth + -- calcolo il secondo diametro del cono + dMillTotDiam = dMillDiam + ( abs(dThickTool) * tan(dSideAng)) * 2 end end -- copio la feature nel layer di appoggio diff --git a/LuaLibs/WProcessLapJoint.lua b/LuaLibs/WProcessLapJoint.lua index b19541f..7ea26b8 100644 --- a/LuaLibs/WProcessLapJoint.lua +++ b/LuaLibs/WProcessLapJoint.lua @@ -1,4 +1,4 @@ --- WProcessLapJoint.lua by Egaltech s.r.l. 2020/11/19 +-- WProcessLapJoint.lua by Egaltech s.r.l. 2021/01/20 -- Gestione calcolo mezzo-legno per Pareti -- Tabella per definizione modulo @@ -774,7 +774,7 @@ local function AddMillCornerMachining( nNewProc, nFacInd, tFacAdj, nTypeConeCut, return false, sErr end -- se flag lavorazione spessore passante setto la nota per spostarla dopo i tagli di lama - if bThruThick then + if bThruThick and nTypeConeCut == 1 then EgtSetInfo( nMchId, 'MOVE_AFTER', 1) end -- aggiungo geometria @@ -843,15 +843,19 @@ local function AddMillCorner( nTypeConeCut, vFace, Proc, nRawId, b3Raw, local dMillDiamTh = 20 local dToolLength = 20 local dThickTool = 20 + local dSideAng = 0 if EgtMdbSetCurrMachining( sMilling) then local sTuuid = EgtMdbGetCurrMachiningParam( MCH_MP.TUUID) if EgtTdbSetCurrTool( EgtTdbGetToolFromUUID( sTuuid) or '') then dMillDiamTh = EgtTdbGetCurrToolThDiam() or dMillDiamTh dMillTotDiam = EgtTdbGetCurrToolParam( MCH_TP.TOTDIAM) or dMillTotDiam + dSideAng = EgtTdbGetCurrToolParam( MCH_TP.SIDEANG) or dSideAng dMillDiam = EgtTdbGetCurrToolParam( MCH_TP.DIAM) or dMillDiam dThickTool = EgtTdbGetCurrToolParam( MCH_TP.THICK) or dThickTool dToolLength = EgtTdbGetCurrToolParam( MCH_TP.LEN) or dToolLength dMaxDepth = EgtTdbGetCurrToolMaxDepth() or dMaxDepth + -- calcolo il secondo diametro del cono + dMillTotDiam = dMillDiam + ( abs(dThickTool) * tan(dSideAng)) * 2 end end -- copio la feature nel layer di appoggio