DataWindow: spostati joint nelle singole ante
This commit is contained in:
@@ -355,7 +355,7 @@ function WinCreate.AddSashGroup( nParentAreaId, nMeasureType, vDimensions, vJoin
|
||||
EgtSetName( vAreas[i], EgtGetName( vAreas[i]) .. '(' .. WIN_SASH .. ')')
|
||||
EgtSetInfo( vAreas[i], WIN_AREATYPE, WIN_AREATYPES.SASH)
|
||||
local nOutlineLayId = EgtGetFirstNameInGroup( vAreas[i], WIN_AREAOUTLINE)
|
||||
EgtSetInfo( nOutlineLayId, WIN_JOINTS, vJoints)
|
||||
EgtSetInfo( nOutlineLayId, WIN_JOINTS, vJoints[i])
|
||||
EgtSetInfo( vAreas[i], WIN_SASHTYPE, vSashTypes[i])
|
||||
EgtSetInfo( vAreas[i], WIN_OPENING_TYPE, vOpeningTypes[i])
|
||||
if vSashNbrs then
|
||||
|
||||
@@ -214,7 +214,7 @@ local function ConvertTableToGeometry( AreaTable, nParentId)
|
||||
|
||||
-- recupero dati
|
||||
local tSashes = AreaTable[JWD_SASH_LIST]
|
||||
local vJoints = GetJoints( AreaTable[JWD_JOINTS])
|
||||
--local vJoints = GetJoints( AreaTable[JWD_JOINTS])
|
||||
local nBottomRailNbr = 0
|
||||
if AreaTable[JWD_BOTTOMRAIL] then
|
||||
nBottomRailNbr = AreaTable[JWD_BOTTOMRAIL_QTY]
|
||||
@@ -231,6 +231,7 @@ local function ConvertTableToGeometry( AreaTable, nParentId)
|
||||
|
||||
-- anta singola
|
||||
if #tSashes == 1 then
|
||||
local vJoints = GetJoints( AreaTable[JWD_JOINTS])
|
||||
local nOpeningType = GetOpeningType( tSashes[1][JWD_OPENING_TYPE])
|
||||
local nAreaId = WinCreate.AddSash( nParentId, vJoints, nOpeningType, nAreaNbr)
|
||||
-- aggiungo ferramenta sull'anta
|
||||
@@ -262,6 +263,7 @@ local function ConvertTableToGeometry( AreaTable, nParentId)
|
||||
local vOpeningTypes = {}
|
||||
local vMeasureType = {}
|
||||
local vSashNbrs = {}
|
||||
local vJoints = {}
|
||||
for i = 1, #tSashes do
|
||||
vMeasureType[i] = GetMeasureType( tSashes[i][JWD_MEASURE_TYPE])
|
||||
vDimensions[i] = tSashes[i][JWD_DIMENSION]
|
||||
@@ -270,6 +272,7 @@ local function ConvertTableToGeometry( AreaTable, nParentId)
|
||||
end
|
||||
vOpeningTypes[i] = GetOpeningType( tSashes[i][JWD_OPENING_TYPE])
|
||||
vSashNbrs[i] = tSashes[i][JWD_ID_SASH]
|
||||
vJoints[i] = GetJoints( tSashes[i][JWD_JOINTS])
|
||||
end
|
||||
table.remove( vDimensions)
|
||||
local vSashTypes, sHandleSide = GetSashTypes( tSashes, vOpeningTypes)
|
||||
|
||||
Reference in New Issue
Block a user