- versione definitiva

This commit is contained in:
luca.bacis
2022-01-28 08:40:26 +01:00
parent 1dc3f2594b
commit 8cb5c8e19a
+12 -13
View File
@@ -3107,7 +3107,7 @@ local function MakePocket( Proc, ptPs, tvtN, nFaceRef, sMchFind, nUseRoughTool,
sPocketing = ML.FindPocketing( sMchFind, dFaceDiamTool, dElev + dCollSic)
end
if not sPocketing then
local sErr = 'Error : '.. sMchFind ..' not found in library'
local sErr = 'Error : ' .. sMchFind .. ' not found in library'
EgtOutLog( sErr)
return false, sErr
end
@@ -4138,7 +4138,7 @@ local function MakeSpecialThreeFaces( Proc, tFData)
sPocketing = ML.FindPocketing( sMchFind, dDiam2, tFData.dFacElev2 + dCollSic2)
if not sPocketing then
local sErr = 'Error : '..sMchFind..' not found in library'
local sErr = 'Error : ' .. sMchFind .. ' not found in library'
EgtOutLog( sErr)
return false, sErr
end
@@ -4312,14 +4312,14 @@ local function MakeSidePocketings( Proc, tFData, dCollSic, bSpecialMillOnSide,
if Proc.Fct == 3 and bIsU then
-- lavoro con svuotature (singola o doppia contrapposta)
nOk, sErr, dDimMin, dDimMax, dDepth, vtOrtho, _, _, _, _, _, _, _, _, bOrthoFaces = MakeByPockets( Proc, nil, bMillDown)
-- se lavorazione non idonee (asse della feature troppo inclinato e impossibile lavorare completamente da due parti)
-- se lavorazione non idonea (asse della feature troppo inclinato e impossibile lavorare completamente da due parti)
if nOk == -2 then
if not sMchFind then
sMchFind = sMchFindBackUp
end
sPocketing = ML.FindPocketing( sMchFind, dDiam)
if not sPocketing then
local sErr = 'Error : '..sMchFind..' not found in library'
local sErr = 'Error : ' .. sMchFind .. ' not found in library'
EgtOutLog( sErr)
return 1, false, sErr
end
@@ -4329,7 +4329,7 @@ local function MakeSidePocketings( Proc, tFData, dCollSic, bSpecialMillOnSide,
if sStat == 'MNF' then
sPocketing = ML.FindPocketing( sMchFind, dDiam)
if not sPocketing then
local sErr = 'Error : '..sMchFind..' not found in library'
local sErr = 'Error : ' .. sMchFind .. ' not found in library'
EgtOutLog( sErr)
return 1, false, sErr
end
@@ -4343,7 +4343,7 @@ local function MakeSidePocketings( Proc, tFData, dCollSic, bSpecialMillOnSide,
else
sPocketing = ML.FindPocketing( sMchFind, dDiam)
if not sPocketing then
local sErr = 'Error : '..sMchFind..' not found in library'
local sErr = 'Error : ' .. sMchFind .. ' not found in library'
EgtOutLog( sErr)
return 1, false, sErr
end
@@ -4405,9 +4405,8 @@ local function MakeSidePocketings( Proc, tFData, dCollSic, bSpecialMillOnSide,
sWarn = sErr
-- se ho antischeggia con fresa le inserisco
if _nChamfer < 2 and Q_ANTISPLINT_TYPE == 2 then
local bOk, sWarn2 = ManageAntiSplintByMill( Proc, tFData.nFacInd, bMillDown, bDoubleSide,
vtOrtho, nPathInt, nSurfInt, dDepth,
bOneShot, nFirstMachId)
local bOk, sWarn2 = ManageAntiSplintByMill( Proc, tFData.nFacInd, bMillDown, bDoubleSide, vtOrtho,
nPathInt, nSurfInt, dDepth, bOneShot, nFirstMachId)
sWarn = FormatWarning( sWarn, sWarn2)
end
-- se abilitato dal parametro Q inserisco pulitura spigoli o contorno con fresa più piccola
@@ -4421,7 +4420,7 @@ local function MakeSidePocketings( Proc, tFData, dCollSic, bSpecialMillOnSide,
bOk = true
end
-- 03/09/2020 da conferma di Fabio Squaratti: Per ora solo sulla feature 016:
-- se ha fallito la fresatura (qua sopra) allora di default ( anche se il flag Q della lama è disattivato) prima provo la lama
-- se ha fallito la fresatura (qua sopra) allora di default (anche se il flag Q della lama è disattivato) prima provo la lama
if Proc.Prc == 16 then
_bForceUseBlade = true
end
@@ -4438,7 +4437,7 @@ local function MakeSidePocketings( Proc, tFData, dCollSic, bSpecialMillOnSide,
if sPocketing then
sWarn = ''
else
local sErr2 = 'Error : '..sMchFind..' not found in library'
local sErr2 = 'Error : ' .. sMchFind .. ' not found in library'
EgtOutLog( sErr2)
return 1, false, sErr2
end
@@ -4752,7 +4751,7 @@ local function MakePocketingOrMilling( Proc, tFData, bSinglePart)
_, tvtNx[2] = EgtSurfTmFacetCenter( Proc.Id, vAdj[i], GDB_ID.ROOT)
tDimAndRef[2] = { dH2, dV2, rfFac2}
local ptPs = ( ptP1 + ptP2) / 2
local bOk, sWarn2 = MachineByMill( Proc, tvtNx, tFData.nFacInd, vAdj[i], ptPs, tDimAndRef,
local bOk, sWarn2 = MachineByMill( Proc, tvtNx, tFData.nFacInd, vAdj[i], ptPs, tDimAndRef,
EgtIf( Proc.Fct == 3 and bIsU, 0, 2), nUseRoughTool, dAng, sPocketing, sTuuidPk, tFData.dFacElev)
if not bOk then return bOk, sWarn2 end
sWarn = FormatWarning( sWarn, sWarn2)
@@ -4808,7 +4807,7 @@ local function MakeTwoFaces( Proc, bSinglePart, bPrevBhSideMill)
return bOk, sErr
end
-- altrimenti lavoro con svuotatura
else
else
local bOk, sErr = MakePocketingOrMilling( Proc, tFData, bSinglePart)
return bOk, sErr
end