- in BeamData migliorate GetMinNzTopHead e GetMinNzDownUp

- update versione
This commit is contained in:
luca.mazzoleni
2025-05-16 11:12:18 +02:00
parent f3ecddd836
commit f38574d7cf
2 changed files with 18 additions and 62 deletions
+17 -61
View File
@@ -115,71 +115,27 @@ local function GetMaxLenRidgeLapFromBottom( dHRaw)
end
BeamData.GetMaxLenRidgeLapFromBottom = GetMaxLenRidgeLapFromBottom
---------------------------------------------------------------------
local function GetMinNzTopHead( vtNFace)
return sin( -10)
local function GetMinNzTopHead( vtNFace, Tool)
if Tool and Tool.sFamily ~= 'SAWBLADE' then
if abs( vtNFace:getY()) < 0.68 then
return sin( -15)
else
return sin( -10)
end
else
if abs( vtNFace:getY()) < 0.68 then
return sin( -11)
else
return sin( -10)
end
end
end
---------------------------------------------------------------------
local function GetMinNzDownUp( b3Raw, vtNFace, vtToolDirection)
if vtToolDirection and vtToolDirection:getZ() > 0.35 then
-- N_HorAng < 15° or N_HorAng > 55°
if vtNFace and ( abs( vtNFace:getY()) < 0.259 or abs( vtNFace:getY()) > 0.819) then
return -0.708
-- N_HorAng > 50°
elseif vtNFace and abs( vtNFace:getY()) > 0.766 then
return -0.383
else
return EgtIf( b3Raw:getDimZ() < BeamData.MIN_DIM_HBEAM, -0.609, -0.383)
end
elseif vtToolDirection and vtToolDirection:getZ() < - 0.01
and ( vtNFace and ( abs( vtNFace:getY()) > 0.983))
and ( b3Raw:getDimY() < 210) then
return -0.173
else
-- N_HorAng > 60°
if vtNFace and ( abs( vtNFace:getY()) > 0.866) then
return -0.708
else
if b3Raw:getDimZ() < 120 then
return -0.708
elseif b3Raw:getDimZ() < 200 then
-- N_HorAng < 15° or N_HorAng > 55°
if vtNFace and ( abs( vtNFace:getY()) < 0.259 or abs( vtNFace:getY()) > 0.819) then
return -0.5
else
return -0.383
end
elseif b3Raw:getDimZ() < 300 then
-- N_HorAng < 10°
if vtNFace and ( abs( vtNFace:getY()) < 0.174) then
return -0.5
else
return -0.259
end
elseif b3Raw:getDimZ() < BeamData.MIN_DIM_HBEAM then
-- N_HorAng < 10°
if vtNFace and ( abs( vtNFace:getY()) < 0.174) then
return -0.342
else
return -0.259
end
else
-- N_HorAng < 10°
if vtNFace and ( abs( vtNFace:getY()) < 0.174) then
return -0.383
else
return -0.174
end
end
end
end
-- con angolo limite di -11 il DownUp ha senso solo se si è sotto all'angolo limite
local function GetMinNzDownUp( b3Raw, vtNFace, vtToolDirection, Tool)
return GetMinNzTopHead( vtNFace, Tool)
end
---------------------------------------------------------------------
+1 -1
View File
@@ -9,7 +9,7 @@
require( 'EmtGenerator')
EgtEnableDebug( false)
PP_VER = '2.7e3'
PP_VER = '2.7e4'
MIN_MACH_VER = '2.5j1'
EgtOutLog ( '** Saomad-KAIROS '..PP_VER..' (MinMach '.. MIN_MACH_VER ..') **', 1)