From bd7c69ac0a90ef554b2135f0a06cb41ef23fca31 Mon Sep 17 00:00:00 2001 From: "andrea.villa" Date: Tue, 7 Apr 2026 11:43:46 +0200 Subject: [PATCH] - Tolto funzioni per chiodature in doppio - Anche se ci viene passata origine 1, si considera come fosse la 3 --- Essetre-90480023_XS-MW.mlde | 2 +- Wall/WallData.lua | 88 +------------------------------------ 2 files changed, 3 insertions(+), 87 deletions(-) diff --git a/Essetre-90480023_XS-MW.mlde b/Essetre-90480023_XS-MW.mlde index 253198a..2d08fee 100644 --- a/Essetre-90480023_XS-MW.mlde +++ b/Essetre-90480023_XS-MW.mlde @@ -8,7 +8,7 @@ require( 'EmtGenerator') EgtEnableDebug( false) if not EmtModifyHeadAuxDirection then error( 'A newer version of the program is required (minimum 2.3j5)') end -PP_VER = '3.1d1_DEV6' +PP_VER = '3.1d1_DEV7' PP_NVER = '2.7.4.1' -- Parametri macchina diff --git a/Wall/WallData.lua b/Wall/WallData.lua index d59782e..dae6d57 100644 --- a/Wall/WallData.lua +++ b/Wall/WallData.lua @@ -63,9 +63,9 @@ end ------------------------------------------------------------------------------------------------------------- local function GetOrigCorner( RefPos) if RefPos == 1 then - return 'BR' + return 'BL' elseif RefPos == 2 then - return 'TR' + return 'TL' elseif RefPos == 3 then return 'BL' elseif RefPos == 4 then @@ -76,90 +76,6 @@ local function GetOrigCorner( RefPos) end WallData.GetOrigCorner = GetOrigCorner -------------------------------------------------------------------------------------------------------------- -local function VerifyFeatureForDouble( Proc) - -- deve essere attiva - if Proc.Flg == 0 then return 0 end - -- non deve essere giĆ  associata - if Proc.Double then return 0 end - -- deve essere contorno libero - if not ( ( Proc.Grp == 0 or Proc.Grp == 3 or Proc.Grp == 4) and ( Proc.Prc == 250)) then return 0 end - -- non deve essere una svuotatura - if EgtGetInfo( Proc.Id, 'PCKT', 'i') == 1 then return 0 end - -- deve richiedere utensili opportuni - local nTool = EgtGetInfo( Proc.Id, 'CNT_DATA', 'i') - if nTool ~= 12 and nTool ~= 14 then return 0 end - -- deve avere una curva ausiliaria associata - local AuxId = EgtGetInfo( Proc.Id, 'AUXID', 'i') - if not AuxId then return 0 end - AuxId = AuxId + Proc.Id - -- questa curva deve essere una retta orientata come gli assi X o Y - if Proc.Box:getDimY() > 1 and Proc.Box:getDimX() > 1 then return 0 end - local ptS = EgtSP( AuxId, GDB_ID.ROOT) - local ptE = EgtEP( AuxId, GDB_ID.ROOT) - -- va bene se diretta come l'asse X - if abs( ptS:getY() - ptE:getY()) < 1 then - if ptS:getX() = MIN_INTERAX then - Proc.Double = 1 - Proc.Delta = dDeltaY - EgtSetInfo( Proc.Id, 'CNT_DATA', '14') - OtherProc.Flg = 0 - OtherProc.Double = -1 - break - elseif dDeltaY <= -MIN_INTERAX then - OtherProc.Double = 1 - OtherProc.Delta = -dDeltaY - EgtSetInfo( OtherProc.Id, 'CNT_DATA', '14') - Proc.Flg = 0 - Proc.Double = -1 - break - end - end - end - -- se altrimenti linea lungo Y - elseif nType == 2 then - local dLen = ptS:getY() - ptE:getY() - if abs( dLen) >= MIN_INTERAX + MIN_EXTRA_Y then - Proc.Double = 2 - Proc.Delta = max( abs( dLen) / 2, MIN_INTERAX) * EgtIf( dLen > 0, 1, -1) - Proc.DblAcc = abs( dLen) - abs( Proc.Delta) - EgtSetInfo( Proc.Id, 'CNT_DATA', '14') - end - end - end -end -WallData.FindFeaturesInDouble = FindFeaturesInDouble - ------------------------------------------------------------------------------------------------------------- local function GetSawHeadSide( dSpeed, sHead) if sHead == 'H2' then