- corretta mancanza parametro dFaceElev2 a MakePocketingOrMilling()

This commit is contained in:
luca.bacis
2022-01-14 14:47:49 +01:00
parent eba1423f65
commit 079eecbbca
+8 -8
View File
@@ -4676,7 +4676,7 @@ local function MakeSidePocketings( Proc, nFacInd, rfFac, dH, dV, vtN, dFacElev,
end
---------------------------------------------------------------------
local function MakePocketingOrMilling( Proc, nFacInd, nFacInd2, bSinglePart, dFacElev)
local function MakePocketingOrMilling( Proc, nFacInd, nFacInd2, bSinglePart, dFacElev, dFacElev2)
-- dati della faccia
local ptC, vtN = EgtSurfTmFacetCenter( Proc.Id, nFacInd, GDB_ID.ROOT)
local rfFac, dH, dV = EgtSurfTmFacetMinAreaRectangle( Proc.Id, nFacInd, GDB_ID.ROOT)
@@ -5015,7 +5015,7 @@ local function MakeTwoFaces( Proc, bSinglePart, bPrevBhSideMill)
end
-- recupero la faccia con il maggior numero di adiacenze e l'elevazione relativa
local nFacInd, dFacElev, nFacInd2, _ = BL.GetFaceWithMostAdj( Proc.Id, _nPartId)
local nFacInd, dFacElev, nFacInd2, dFacElev2 = BL.GetFaceWithMostAdj( Proc.Id, _nPartId)
if not nFacInd or nFacInd < 0 then
local sErr = 'Error : MakeTwoFaces could not find reference face'
EgtOutLog( sErr)
@@ -5037,7 +5037,7 @@ local function MakeTwoFaces( Proc, bSinglePart, bPrevBhSideMill)
end
-- altrimenti lavoro con svuotatura
else
local bOk, sErr = MakePocketingOrMilling( Proc, nFacInd, nFacInd2, bSinglePart, dFacElev)
local bOk, sErr = MakePocketingOrMilling( Proc, nFacInd, nFacInd2, bSinglePart, dFacElev, dFacElev2)
return bOk, sErr
end
@@ -5053,7 +5053,7 @@ local function MakeThreeFaces( Proc, bSinglePart, bPrevBhSideMill)
end
-- recupero la faccia con il maggior numero di adiacenze e l'elevazione relativa
local nFacInd, dFacElev, nFacInd2, _ = BL.GetFaceWithMostAdj( Proc.Id, _nPartId)
local nFacInd, dFacElev, nFacInd2, dFacElev2 = BL.GetFaceWithMostAdj( Proc.Id, _nPartId)
if not nFacInd or nFacInd < 0 then
local sErr = 'Error : MakeThreeFaces could not find reference face'
EgtOutLog( sErr)
@@ -5092,7 +5092,7 @@ local function MakeThreeFaces( Proc, bSinglePart, bPrevBhSideMill)
end
-- altrimenti lavorazione di svuotatura o contornatura
else
local bOk, sErr = MakePocketingOrMilling( Proc, nFacInd, nFacInd2, bSinglePart, dFacElev)
local bOk, sErr = MakePocketingOrMilling( Proc, nFacInd, nFacInd2, bSinglePart, dFacElev, dFacElev2)
return bOk, sErr
end
end
@@ -5105,7 +5105,7 @@ local function MakeMoreFaces( Proc, bSinglePart, bPrevBhSideMill)
local bClosedOrthoFaces
local nBottomFace
-- recupero la faccia con il maggior numero di adiacenze e l'elevazione relativa
local nFacInd, dFacElev, nFacInd2, _ = BL.GetFaceWithMostAdj( Proc.Id, _nPartId)
local nFacInd, dFacElev, nFacInd2, dFacElev2 = BL.GetFaceWithMostAdj( Proc.Id, _nPartId)
if not nFacInd or nFacInd < 0 then
if nFacInd == -1 then
bClosedOrthoFaces = nFacInd2
@@ -5124,7 +5124,7 @@ local function MakeMoreFaces( Proc, bSinglePart, bPrevBhSideMill)
nBottomFace = i - 1
if EgtSurfTmRemoveFacet( nNewProc, nBottomFace) then
-- recupero la faccia con il maggior numero di adiacenze e l'elevazione relativa
nFacInd, dFacElev, nFacInd2, _ = BL.GetFaceWithMostAdj( nNewProc, _nPartId)
nFacInd, dFacElev, nFacInd2, dFacElev2 = BL.GetFaceWithMostAdj( nNewProc, _nPartId)
if not nFacInd or nFacInd < 0 then
if nFacInd == -1 then
bClosedOrthoFaces = nFacInd2
@@ -5178,7 +5178,7 @@ local function MakeMoreFaces( Proc, bSinglePart, bPrevBhSideMill)
end
-- altrimenti non è una fessura
else
local bOk, sErr = MakePocketingOrMilling( Proc, nFacInd, nFacInd2, bSinglePart, dFacElev)
local bOk, sErr = MakePocketingOrMilling( Proc, nFacInd, nFacInd2, bSinglePart, dFacElev, dFacElev2)
return bOk, sErr, bPrevBhSideMill
end