diff --git a/LuaLibs/ProcessLapJoint.lua b/LuaLibs/ProcessLapJoint.lua index 81effb0..a97895f 100644 --- a/LuaLibs/ProcessLapJoint.lua +++ b/LuaLibs/ProcessLapJoint.lua @@ -5973,8 +5973,8 @@ end --------------------------------------------------------------------- local function AddMillCornerMachining( nPartId, nNewProc, nFacInd, tFacAdj, nAddGrpId, - dToolDiam, dThick, sMilling, dOffsAng, dDepthMach, - bThruThick, dThSurf, dDiam1, dDiam2, dTall1, + dToolDiam, sMilling, dOffsAng, dDepthMach, + dDiam1, dDiam2, dTall1, dTall2, dDiam3, dTall3, bMakeLocSurf, vFace) -- variabili costruzione geometria @@ -6150,7 +6150,7 @@ local function AddMillCornerMachining( nPartId, nNewProc, nFacInd, tFacAdj, nAdd end -- inserisco la lavorazione local sName = 'Clean_' .. ( EgtGetName( nNewProc.Id) or tostring( nNewProc.Id)) - local nMchId = WM.AddMachining( nNewProc.Id, sName, sMilling) + local nMchId = EgtAddMachining( sName, sMilling) if not nMchId then local sErr = 'Error adding machining ' .. sName .. '-' .. sMilling EgtOutLog( sErr) @@ -6196,8 +6196,7 @@ local function AddMillCornerMachining( nPartId, nNewProc, nFacInd, tFacAdj, nAdd end --------------------------------------------------------------------- -local function AddMillCorner( vFace, Proc, dToolDiam, nAddGrpId, dThick, nMasterNewProc, dDepthMach, bThruThick) - +local function AddMillCorner( vFace, Proc, dToolDiam, nAddGrpId, nMasterNewProc, dDepthMach) local sMilling, dMaxDepth -- se ripresa angolo con fresa cono 60° con ripresa @@ -6296,21 +6295,21 @@ local function AddMillCorner( vFace, Proc, dToolDiam, nAddGrpId, dThick, nMaster local dAngOffs = (dAng + 90) / 2 -- primo taglio local bOk, sErr = AddMillCornerMachining( Proc.PartId, nNewProc, nFacInd, tFacAdj, nAddGrpId, - dToolDiam, dThick, sMilling, -dAngOffs, dDepthMach, - bThruThick, dMillDiam, dMillTotDiam, abs( dThickTool), + dToolDiam, sMilling, -dAngOffs, dDepthMach, + dMillDiam, dMillTotDiam, abs( dThickTool), dMaxDepth, dMillDiamTh, dToolLength, bMakeLocSurf, vFace) if not bOk then return bOk, sErr end -- secondo taglio bOk, sErr = AddMillCornerMachining( Proc.PartId, nNewProc, nFacInd, tFacAdj, nAddGrpId, - dToolDiam, dThick, sMilling, dAngOffs, dDepthMach, - bThruThick, dMillDiam, dMillTotDiam, abs( dThickTool), + dToolDiam, sMilling, dAngOffs, dDepthMach, + dMillDiam, dMillTotDiam, abs( dThickTool), dMaxDepth, dMillDiamTh, dToolLength, bMakeLocSurf, vFace) if not bOk then return bOk, sErr end -- altrimenti ho un solo percorso else local bOk, sErr = AddMillCornerMachining( Proc.PartId, nNewProc, nFacInd, tFacAdj, nAddGrpId, - dToolDiam, dThick, sMilling, 0, dDepthMach, - bThruThick, dMillDiam, dMillTotDiam, abs( dThickTool), + dToolDiam, sMilling, 0, dDepthMach, + dMillDiam, dMillTotDiam, abs( dThickTool), dMaxDepth, dMillDiamTh, dToolLength, bMakeLocSurf, vFace) if not bOk then return bOk, sErr end end @@ -7714,7 +7713,7 @@ local function MakeMoreFaces( Proc, nPhase, nRawId, nPartId, dOvmHead, bSinglePa sWarn = 'Warning : elevation bigger than max tool depth' EgtOutLog( sWarn) end - local bCleanCornerOk, sCleanCornerWarn = AddMillCorner( vFace, Proc, dToolDiameter, nAddGrpId, dDiam, nNewProc, dDepth) + local bCleanCornerOk, sCleanCornerWarn = AddMillCorner( vFace, Proc, dToolDiameter, nAddGrpId, nNewProc, dDepth) if not bCleanCornerOk then return false, sCleanCornerWarn end if sCleanCornerWarn then if not sWarn then sWarn = '' end