DataWindow :

- corretta lettura ferramenta da jwd nel caso di ante multiple.
This commit is contained in:
SaraP
2025-10-30 15:46:12 +01:00
parent d29ecc5a84
commit 66d41f20a3
+8 -7
View File
@@ -207,20 +207,21 @@ local function ConvertTableToGeometry( AreaTable, nParentId)
local nOpeningType = GetOpeningType( tSashes[1][JWD_OPENING_TYPE])
local nAreaId = WinCreate.AddSash( nParentId, vJoints, nOpeningType, nAreaNbr)
-- aggiungo ferramenta sull'anta
local sHandleSide
if nOpeningType == WIN_OPENING_TYPES.TURNONLY_LEFT or
nOpeningType == WIN_OPENING_TYPES.TILTTURN_LEFT or
nOpeningType == WIN_OPENING_TYPES.TILTONLY_TOP or
nOpeningType == WIN_OPENING_TYPES.COPLANARSLIDE_LEFT or
nOpeningType == WIN_OPENING_TYPES.LIFTSLIDE_LEFT then
EgtSetInfo( nAreaId, WIN_HDW_HANDLE, 'Sx')
sHandleSide = 'Sx'
elseif nOpeningType == WIN_OPENING_TYPES.TURNONLY_RIGHT or
nOpeningType == WIN_OPENING_TYPES.TILTTURN_RIGHT or
nOpeningType == WIN_OPENING_TYPES.TILTONLY_BOTTOM or
nOpeningType == WIN_OPENING_TYPES.COPLANARSLIDE_RIGHT or
nOpeningType == WIN_OPENING_TYPES.LIFTSLIDE_RIGHT then
EgtSetInfo( nAreaId, WIN_HDW_HANDLE, 'Dx')
sHandleSide = 'Dx'
end
WinCreate.AddHardware( nAreaId, AreaTable[JWD_HARDWARE])
WinCreate.AddHardware( nAreaId, AreaTable[JWD_HARDWARE], sHandleSide)
-- bottomrail
WinCreate.AddBottomRail( nAreaId, nBottomRailNbr)
-- analizzo sottaree
@@ -228,9 +229,6 @@ local function ConvertTableToGeometry( AreaTable, nParentId)
-- ante multiple
else
-- aggiungo la ferramenta sull'area parent
WinCreate.AddHardware( nParentId, AreaTable[JWD_HARDWARE])
-- recupero dati delle ante
local vDimensions = {}
local vOpeningTypes = {}
@@ -242,7 +240,6 @@ local function ConvertTableToGeometry( AreaTable, nParentId)
end
table.remove( vDimensions)
local vSashTypes, sHandleSide = GetSashTypes( tSashes, vOpeningTypes)
EgtSetInfo( nParentId, WIN_HDW_HANDLE, sHandleSide)
-- aggiungo il gruppo di ante
local vAreas = WinCreate.AddSashGroup( nParentId, WIN_MEASURE.PERCENTAGE, vDimensions, vJoints, vSashTypes, vOpeningTypes, nAreaNbr, vSashNbrs)
@@ -253,6 +250,10 @@ local function ConvertTableToGeometry( AreaTable, nParentId)
-- analizzo sottaree
ConvertTableToGeometry( AreaTable[JWD_AREA_LIST][i], vAreas[i])
end
-- aggiungo la ferramenta sull'area split
local nSplitAreaId = EgtGetParent( vAreas[1])
WinCreate.AddHardware( nSplitAreaId, AreaTable[JWD_HARDWARE], sHandleSide)
end