Corrette origini

This commit is contained in:
andrea.villa
2026-04-07 10:33:05 +02:00
parent 912dd11c64
commit 5734560db2
3 changed files with 17 additions and 27 deletions
+6 -12
View File
@@ -77,12 +77,6 @@ function OnProgramStart()
'L169='..EgtNumToString( Orig4DeltaY, 2)..'\n'..
'L170='..EgtNumToString( -Orig4DeltaX, 2)..'\n'..
'L171='..EgtNumToString( Orig4DeltaZ, 2)..'\n'..
'L172='..EgtNumToString( Orig5DeltaY, 2)..'\n'..
'L173='..EgtNumToString( -Orig5DeltaX, 2)..'\n'..
'L174='..EgtNumToString( Orig5DeltaZ, 2)..'\n'..
'L175='..EgtNumToString( Orig6DeltaY, 2)..'\n'..
'L176='..EgtNumToString( -Orig6DeltaX, 2)..'\n'..
'L177='..EgtNumToString( Orig6DeltaZ, 2)..'\n'..
'G114'..' EA'..EgtNumToString( DeltaTabY + DimTabY - SawDeltaY, 2)..' EB'..EgtNumToString( -DeltaTabX + SawDeltaX, 2)..
' EC'..EgtNumToString( DeltaTabZ - SawDeltaZ, 2)..' ED'..EgtNumToString( 0, 2)..' EE'..EgtNumToString( SawOffs, 2)..
' EF'..EgtNumToString( DeltaTabY + DimTabY, 2)..' EG'..EgtNumToString( -DeltaTabX, 2)..
@@ -667,14 +661,14 @@ function CalcInterpPlane()
local ptS = Point3d( xS, yS, zS)
-- calcolo per piano generico
local vtE
if EMT.HEAD == 'H1' then
if EMT.HEAD == 'H1' or EMT.HEAD == 'H12' then
vtE = EgtGetCalcToolDirFromAngles( EMT.R1, EMT.R2, EMT.R3)
elseif EMT.HEAD == 'H3' then
vtE = EgtGetCalcAuxDirFromAngles( EMT.R1, EMT.R2, EMT.R3)
else
vtE = Z_AX()
end
if EMT.HEAD == 'H1' or EMT.HEAD == 'H3' then
if EMT.HEAD == 'H1' or EMT.HEAD == 'H12' or EMT.HEAD == 'H3' then
EMT.IPLGLFR = Frame3d( ptS, vtE)
else
EMT.IPLGLFR = Frame3d( ptS, Y_AX(), -X_AX(), Z_AX())
@@ -694,17 +688,17 @@ function CalcInterpPlane()
end
dAngO = 0
end
local xOut = yS - DeltaTabY - DimTabY
local yOut = - ( xS - DeltaTabX)
local xOut = yS - DeltaTabY
local yOut = - ( xS - DeltaTabX - DimTabX)
local zOut = zS
if EMT.ORIG == 2 then
xOut = yS - DeltaTabY
yOut = - ( xS - DeltaTabX)
elseif EMT.ORIG == 3 then
xOut = yS - DeltaTabY - DimTabY
xOut = yS - DeltaTabY
yOut = - ( xS - DeltaTabX - DimTabX)
elseif EMT.ORIG == 4 then
xOut = yS - DeltaTabY
xOut = yS - DeltaTabY - DimTabY
yOut = - ( xS - DeltaTabX - DimTabX)
elseif EMT.ORIG == 5 then
xOut = yS - DeltaTabY - DimTabY