Egalware/DataWall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2.6b2'

Browse Source
This commit is contained in:
luca.mazzoleni
2024-02-21 15:20:05 +01:00
parent a2d89cd98d 1a4baaf1be
commit 8631e22d45
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LuaLibs/WallExec.lua
+9 -3
View File
@@ -85,9 +85,15 @@ function WallExec.ProcessWalls( dRawL, dRawW, dRawH, vWall, bMachGroupOk, bNewPr
if WD.GetOrigCorner then
sOrigCorner = WD.GetOrigCorner( EgtGetInfo( BtlInfoId, 'REFPOS', 'i') or 0)
end
local DeltaX = EgtGetInfo( BtlInfoId, 'PANELDELTAY', 'd') or WD.DELTA_X or 0
local DeltaY = EgtGetInfo( BtlInfoId, 'PANELDELTAX', 'd') or WD.DELTA_Y or 0
local DeltaZ = EgtGetInfo( BtlInfoId, 'PANELDELTAZ', 'd') or WD.DELTA_Z or 0
-- 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
-- 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)
if sOrigCorner == 'TL' then
nCorner = MCH_CR.TL
OrigOnTab = Point3d( 0 + abs( DeltaX), b3Tab:getDimY() - abs( DeltaY), DeltaZ)
UpdateLog.txt
+3
View File
@@ -1,5 +1,8 @@
==== Wall Update Log ====
Versione 2.6b2 (21/02/2024)
- Added : aggiunta gestione spostamento pannello rispetto a origine da dato BTL di TS3v7.
Versione 2.6b1 (20/02/2024)
- Modif : In BatchProcess tolleranza su altezza pannello in grezzo portata a 0.1 mm
- Fixed : in LapJoint piccola correzione ai casi in cui si utilizza il SIDESTEP.