Merge remote-tracking branch 'origin/develop' into STR0002_ImprovePocketing

This commit is contained in:
andrea.villa
2024-05-31 12:55:20 +02:00
+6 -3
View File
@@ -84,15 +84,18 @@ function MachiningLib.FindMill( Proc, ToolSearchParameters)
-- prima verifico che utensile sia compatibile
local bIsToolCompatible = true
if TOOLS[i].sType ~= ToolSearchParameters.sType then
bIsToolCompatible = false
-- se sto cercando una fresa che non può lavorare di testa, quelle che lavorano di testa sono comunque ammesse
if TOOLS[i].sType == 'MILL_STD' and ToolSearchParameters.sType == 'MILL_NOTIP' then
bIsToolCompatible = true
else
bIsToolCompatible = false
end
elseif TOOLS[i].dDiameter > ToolSearchParameters.dMaxToolDiameter then
bIsToolCompatible = false
elseif TOOLS[i].SetupInfo.bIsTopHead and ToolSearchParameters.vtToolDirection:getZ() < TOOLS[i].SetupInfo.dMaxNegativeAngle then
bIsToolCompatible = false
elseif TOOLS[i].SetupInfo.bIsBottomHead and ToolSearchParameters.vtToolDirection:getZ() > TOOLS[i].SetupInfo.dMaxPositiveAngle then
bIsToolCompatible = false
elseif TOOLS[i].sType == 'MILL_NOTIP' and ToolSearchParameters.sType == 'MILL_STD' then
bIsToolCompatible = false
elseif ToolSearchParameters.sMillShape == 'STANDARD' and ( TOOLS[i].dSideAngle ~= 0 or TOOLS[i].bIsPen) then
bIsToolCompatible = false
elseif ToolSearchParameters.sMillShape == 'DOVETAIL' and not TOOLS[i].bIsDoveTail then