diff --git a/LuaLibs/WProcessFreeContour.lua b/LuaLibs/WProcessFreeContour.lua index 42745fb..bbb41bf 100644 --- a/LuaLibs/WProcessFreeContour.lua +++ b/LuaLibs/WProcessFreeContour.lua @@ -2013,7 +2013,7 @@ local function MakeByCut( Proc, nRawId, b3Raw, b3Squaring) -- recupero i dati di tutte le facce local vFace, dMaxWidth, nNewProc = GetFacesData( Proc, bOpposite, true, dSawDiam, dSawMaxDepth, dSawThick, nAddGrpId, b3Raw) -- inserimento dei tagli di lama - local bForceConventionalSawing = EgtGetInfo( Proc.Id, 'Q09', 'd') == 1 + local bForceConventionalSawing = WD.USE_CONVENTIONAL_SAWING local bCtOk, sCtErr = AddCuts( sCutting, vFace, Proc, nRawId, b3Raw, dSawThick, b3Squaring, bForceConventionalSawing) if not bCtOk then return bCtOk, sCtErr end -- se richiesta solo lama, esco diff --git a/LuaLibs/WallExec.lua b/LuaLibs/WallExec.lua index 0aad1d4..4eb0bf0 100644 --- a/LuaLibs/WallExec.lua +++ b/LuaLibs/WallExec.lua @@ -71,40 +71,40 @@ local function GetRawOrigAndDeltas() sOrigCorner = WD.GetOrigCorner( EgtGetInfo( BtlInfoId, 'REFPOS', 'i') or 0) end -- offset da interfaccia - local dDeltaXFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAY', 'd') or 0 - local dDeltaYFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAX', 'd') or 0 - local dDeltaZFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAZ', 'd') or 0 + local dDeltaXFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAY', 'd') + local dDeltaYFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAX', 'd') + local dDeltaZFromBtl = EgtGetInfo( BtlInfoId, 'PANELDELTAZ', 'd') -- se da interfaccia arriva un valore > 0 si usa quello, altrimenti si legge da WallData (default 0) - local DeltaX = EgtIf( dDeltaXFromBtl > 0, dDeltaXFromBtl, WD.DELTA_X or 0) - local DeltaY = EgtIf( dDeltaYFromBtl > 0, dDeltaYFromBtl, WD.DELTA_Y or 0) - local DeltaZ = EgtIf( dDeltaZFromBtl > 0, dDeltaZFromBtl, WD.DELTA_Z or 0) + local DeltaX = EgtIf( dDeltaXFromBtl, dDeltaXFromBtl, WD.DELTA_X or 0) + local DeltaY = EgtIf( dDeltaYFromBtl, dDeltaYFromBtl, WD.DELTA_Y or 0) + local DeltaZ = EgtIf( dDeltaZFromBtl, dDeltaZFromBtl, WD.DELTA_Z or 0) local nCorner local OrigOnTab if sOrigCorner == 'TL' then nCorner = MCH_CR.TL - OrigOnTab = Point3d( 0 + abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( 0 + DeltaX, b3Tab:getDimY() - DeltaY, DeltaZ) elseif sOrigCorner == 'BL' then nCorner = MCH_CR.BL - OrigOnTab = Point3d( 0 + abs( DeltaX), abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( 0 + DeltaX, DeltaY, DeltaZ) elseif sOrigCorner == 'TR' then nCorner = MCH_CR.TR - OrigOnTab = Point3d( b3Tab:getDimX() - abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( b3Tab:getDimX() - DeltaX, b3Tab:getDimY() - DeltaY, DeltaZ) elseif sOrigCorner == 'BR' then nCorner = MCH_CR.BR - OrigOnTab = Point3d( b3Tab:getDimX() - abs( DeltaX), abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( b3Tab:getDimX() - DeltaX, DeltaY, DeltaZ) elseif sOrigCorner == 'TM' then nCorner = MCH_CR.TR - OrigOnTab = Point3d( WD.MID_REF - abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( WD.MID_REF - DeltaX, b3Tab:getDimY() - DeltaY, DeltaZ) elseif sOrigCorner == 'BM' then nCorner = MCH_CR.BR - OrigOnTab = Point3d( WD.MID_REF - abs( DeltaX), abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( WD.MID_REF - DeltaX, DeltaY, DeltaZ) elseif sOrigCorner == 'TN' then nCorner = MCH_CR.TL - OrigOnTab = Point3d( WD.NEW_REF + abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( WD.NEW_REF + DeltaX, b3Tab:getDimY() - DeltaY, DeltaZ) elseif sOrigCorner == 'BN' then nCorner = MCH_CR.BL - OrigOnTab = Point3d( WD.NEW_REF + abs( DeltaX), abs( DeltaY), DeltaZ) + OrigOnTab = Point3d( WD.NEW_REF + DeltaX, DeltaY, DeltaZ) end return sOrigCorner, nCorner, OrigOnTab diff --git a/UpdateLog.txt b/UpdateLog.txt index 95a2f26..5745304 100644 --- a/UpdateLog.txt +++ b/UpdateLog.txt @@ -1,7 +1,11 @@ ==== Wall Update Log ==== +Versione 3.1f2 (25/06/2026) +- Modif : Ora si accettano offset in negativo per posizionamento pezzo su tavola +- Modif : Il Q09 aggiunto in versione 3.1f1 viene sostituito con il parametro da OFFSET -> USE_CONVENTIONAL_SAWING + Versione 3.1f1 (18/06/2026) -- Modif : Aggiunto Q09=1 che inverte lato testa e imposta conventional milling durante i tagli +- Modif : Aggiunto Q09=1 che inverte lato testa e imposta conventional milling durante i tagli (DEPRECATO) Versione 3.1d2 (23/04/2026) - Modif : Tutte le forature vengono ordinate per diametro decrescente diff --git a/Version.lua b/Version.lua index 69a019c..de2127c 100644 --- a/Version.lua +++ b/Version.lua @@ -2,5 +2,5 @@ -- Gestione della versione di Wall NAME = 'Wall' -VERSION = '3.1f1' +VERSION = '3.1f2' MIN_EXE = '3.1c1'