From e56074f662078188a48d0569f0d80d36f1d67956 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Thu, 27 Jun 2024 14:56:37 +0200 Subject: [PATCH 1/3] modifiche ulteriori per parametro DEFAULT_RAW_NO_EXTRA_WIDTH --- BatchProcess.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BatchProcess.lua b/BatchProcess.lua index f24e092..a4ad1fa 100644 --- a/BatchProcess.lua +++ b/BatchProcess.lua @@ -281,9 +281,11 @@ if bToProcess then for i = 1, #vWall do local PosX = EgtGetInfo( vWall[i].Id, 'POSX', 'd') local PosZ = EgtGetInfo( vWall[i].Id, 'POSZ', 'd') - if WD.DEFAULT_RAW_NO_EXTRA_WIDTH and i == 1 then + if bProj and WD.DEFAULT_RAW_NO_EXTRA_WIDTH and i == 1 then PosX = 0 PosZ = 0 + dRawL = vWall[i].Box:getDimX() + dRawW = vWall[i].Box:getDimY() end vWall[i].PosX = PosX + min( dExtraL, 1200) if WD.USE_POSY then From 4531434e7968cad99546a0437d045de1f42c32bb Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Thu, 27 Jun 2024 15:50:24 +0200 Subject: [PATCH 2/3] - correzioni a DEFAULT_RAW_NO_EXTRA_WIDTH --- BatchProcess.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/BatchProcess.lua b/BatchProcess.lua index a4ad1fa..e720dae 100644 --- a/BatchProcess.lua +++ b/BatchProcess.lua @@ -281,12 +281,6 @@ if bToProcess then for i = 1, #vWall do local PosX = EgtGetInfo( vWall[i].Id, 'POSX', 'd') local PosZ = EgtGetInfo( vWall[i].Id, 'POSZ', 'd') - if bProj and WD.DEFAULT_RAW_NO_EXTRA_WIDTH and i == 1 then - PosX = 0 - PosZ = 0 - dRawL = vWall[i].Box:getDimX() - dRawW = vWall[i].Box:getDimY() - end vWall[i].PosX = PosX + min( dExtraL, 1200) if WD.USE_POSY then local PosY = EgtGetInfo( vWall[i].Id, 'POSY', 'd') @@ -374,6 +368,14 @@ if bToProcess then PostErrView( WALL.ERR, WALL.MSG) return end + + -- se impostato flag apposito, in vista il grezzo è uguale al pezzo + if bProj and WD.DEFAULT_RAW_NO_EXTRA_WIDTH and i == 1 then + PosX = 0 + PosZ = 0 + dRawL = vWall[1].Box:getDimX() + dRawW = vWall[1].Box:getDimY() + end -- Verifico dimensioni massime grezzo if dRawL > WD.MAX_LENGTH + 10 * GEO.EPS_SMALL or dRawW > WD.MAX_WIDTH + 10 * GEO.EPS_SMALL or dRawH > WD.MAX_HEIGHT + 10 * GEO.EPS_SMALL then From d5e30baf069fb563513c52cad65e6a13c8c99d57 Mon Sep 17 00:00:00 2001 From: "luca.mazzoleni" Date: Thu, 27 Jun 2024 16:38:45 +0200 Subject: [PATCH 3/3] - ulteriori correzioni per DEFAULT_RAW_NO_EXTRA_WIDTH --- BatchProcess.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/BatchProcess.lua b/BatchProcess.lua index e720dae..6261c91 100644 --- a/BatchProcess.lua +++ b/BatchProcess.lua @@ -281,6 +281,10 @@ if bToProcess then for i = 1, #vWall do local PosX = EgtGetInfo( vWall[i].Id, 'POSX', 'd') local PosZ = EgtGetInfo( vWall[i].Id, 'POSZ', 'd') + if bProj and WD.DEFAULT_RAW_NO_EXTRA_WIDTH and #vWall == 1 then + PosX = 0 + PosZ = 0 + end vWall[i].PosX = PosX + min( dExtraL, 1200) if WD.USE_POSY then local PosY = EgtGetInfo( vWall[i].Id, 'POSY', 'd') @@ -370,9 +374,7 @@ if bToProcess then end -- se impostato flag apposito, in vista il grezzo è uguale al pezzo - if bProj and WD.DEFAULT_RAW_NO_EXTRA_WIDTH and i == 1 then - PosX = 0 - PosZ = 0 + if bProj and WD.DEFAULT_RAW_NO_EXTRA_WIDTH and #vWall == 1 then dRawL = vWall[1].Box:getDimX() dRawW = vWall[1].Box:getDimY() end