diff --git a/Designing/WinJWDConst.lua b/Designing/WinJWDConst.lua index e484e90..00a7fae 100644 --- a/Designing/WinJWDConst.lua +++ b/Designing/WinJWDConst.lua @@ -30,6 +30,7 @@ JWD_NAME = 'Name' JWD_VALUE = 'Value' JWD_ID_GROUP = 'GroupId' JWD_ID_SASH = 'SashId' +JWD_MEASURE_TYPE = 'MeasureType' JWD_FRAME_SHAPE = 'Shape' JWD_DIMENSION_LIST = 'DimensionList' diff --git a/Designing/WinLib/WinManageProject.lua b/Designing/WinLib/WinManageProject.lua index 9209b3d..582cf26 100644 --- a/Designing/WinLib/WinManageProject.lua +++ b/Designing/WinLib/WinManageProject.lua @@ -99,6 +99,20 @@ local function GetOpeningType( sOpeningType) end +--------------------------------------------------------------------- +local function GetMeasureType( sMeasureType) + + if sMeasureType == 'ABSOLUT' then + return WIN_MEASURE.ABSOLUT + elseif sMeasureType == 'PROPORTIONAL' then + return WIN_MEASURE.PROPORTIONAL + elseif sMeasureType == 'PERCENTAGE' then + return WIN_MEASURE.PERCENTAGE + end + + return WIN_MEASURE.PERCENTAGE +end + --------------------------------------------------------------------- -- funzione che ricava la tipologia dell'anta in base al tipo di apertura e alla struttura local function GetSashTypes( tSashes, vOpeningTypes) @@ -246,8 +260,10 @@ local function ConvertTableToGeometry( AreaTable, nParentId) -- recupero dati delle ante local vDimensions = {} local vOpeningTypes = {} + local vMeasureType = {} local vSashNbrs = {} for i = 1, #tSashes do + vMeasureType[i] = GetMeasureType( tSashes[i][JWD_MEASURE_TYPE]) vDimensions[i] = tSashes[i][JWD_DIMENSION] / 100 vOpeningTypes[i] = GetOpeningType( tSashes[i][JWD_OPENING_TYPE]) vSashNbrs[i] = tSashes[i][JWD_ID_SASH] @@ -256,7 +272,7 @@ local function ConvertTableToGeometry( AreaTable, nParentId) local vSashTypes, sHandleSide = GetSashTypes( tSashes, vOpeningTypes) -- aggiungo il gruppo di ante - local vAreas = WinCreate.AddSashGroup( nParentId, WIN_MEASURE.PERCENTAGE, vDimensions, vJoints, vSashTypes, vOpeningTypes, nAreaNbr, vSashNbrs) + local vAreas = WinCreate.AddSashGroup( nParentId, vMeasureType[1], vDimensions, vJoints, vSashTypes, vOpeningTypes, nAreaNbr, vSashNbrs) -- aggiungo le ante for i = 1, #vAreas do -- bottomrail