DataWindow :

- modifiche per uniformare struttura jwd con struttura del progetto
- gestione numerazione delle aree
- correzioni varie.

Designing/WinProject.lua

@@ -40,7 +40,7 @@ local function GetVariableList( sName)
    local List = {}
    local nIndex = 1
    while WDG[sName .. nIndex] do
-      table.insert(List, WDG['JOINT' .. nIndex])
+      table.insert(List, WDG[sName .. nIndex])
       nIndex = nIndex + 1
    end
    return List
@@ -55,6 +55,14 @@ local function CleanVariableList( sName)
    end
 end
 
+----------------------------------------------------------------------------------
+local function FillVariableList( sName, List)
+   CleanVariableList( sName)
+   for i = 1, #List do
+      WDG[sName .. i] = List[i]
+   end
+end
+
 ----------------------------------------------------------------------------------
 local function SetProfilePath()
    _G.sProfilePath = WDG.PROFILEPATH
@@ -123,7 +131,7 @@ _G.GetProfileThresholdsList = GetProfileThresholdsList
 ----------------------------------------------------------------------------------
 local function WinCreate_CreateFrame()
    local JointList = GetVariableList( 'JOINT')
-   WDG.AREAID = WinCreate.CreateFrame( WDG.FRAMETYPE, JointList, WDG.WIDTH, WDG.HEIGHT, WDG.HEIGHT2)
+   WDG.AREAID = WinCreate.CreateFrame( WDG.FRAMETYPE, JointList, WDG.WIDTH, WDG.HEIGHT, WDG.HEIGHT2, WDG.AREANBR)
    CleanVariableList('JOINT')
 end
 _G.WinCreate_CreateFrame = WinCreate_CreateFrame
@@ -131,11 +139,30 @@ _G.WinCreate_CreateFrame = WinCreate_CreateFrame
 ----------------------------------------------------------------------------------
 local function WinCreate_AddSash()
    local JointList = GetVariableList( 'JOINT')
-   WDG.AREAID = WinCreate.AddSash( WDG.AREAID, JointList, WDG.SASHTYPE, WDG.OPENINGTYPE)
+   WDG.AREAID = WinCreate.AddSash( WDG.AREAID, JointList, WDG.OPENINGTYPE, WDG.AREANBR)
    CleanVariableList( 'JOINT')
 end
 _G.WinCreate_AddSash = WinCreate_AddSash
 
+----------------------------------------------------------------------------------
+local function WinCreate_AddSashGroup()
+   local DimensionList = GetVariableList( 'DIMENSION')
+   local JointList = GetVariableList( 'JOINT')
+   local SashTypeList = GetVariableList( 'SASHTYPE')
+   local OpeningTypeList = GetVariableList( 'OPENINGTYPE')
+   local SashNbrList = GetVariableList( 'SASHNBR')
+   
+   local AreaList = WinCreate.AddSashGroup( WDG.AREAID, WDG.MEASURETYPE, DimensionList, JointList, SashTypeList, OpeningTypeList, WDG.AREANBR, SashNbrList)
+   FillVariableList( 'AREAID', AreaList)
+   
+   CleanVariableList( 'DIMENSION')
+   CleanVariableList( 'JOINT')
+   CleanVariableList( 'SASHTYPE')
+   CleanVariableList( 'OPENINGTYPE')
+   CleanVariableList( 'SASHNBR')
+end
+_G.WinCreate_AddSashGroup = WinCreate_AddSashGroup
+
 ----------------------------------------------------------------------------------
 local function WinCreate_AddHardware()
    WinCreate.AddHardware( WDG.AREAID, WDG.FAVOURITE, WDG.HANDLE)
@@ -144,7 +171,7 @@ _G.WinCreate_AddHardware = WinCreate_AddHardware
 
 ----------------------------------------------------------------------------------
 local function WinCreate_AddFill()
-   WDG.AREAID = WinCreate.AddFill( WDG.AREAID, WDG.FILLTYPE)
+   WDG.AREAID = WinCreate.AddFill( WDG.AREAID, WDG.FILLTYPE, WDG.AREANBR)
 end
 _G.WinCreate_AddFill = WinCreate_AddFill
 
@@ -162,62 +189,23 @@ _G.WinCreate_AddThreshold = WinCreate_AddThreshold
 
 ----------------------------------------------------------------------------------
 local function WinCreate_AddSplits()
-   local AreaIndex = 1
-   while WDG['AREAID' .. AreaIndex] do
-      WDG['AREAID' .. AreaIndex] = nil
-      AreaIndex = AreaIndex + 1
-   end
-   local PositionList = {}
-   local PositionIndex = 1
-   while WDG['POSITION' .. PositionIndex] do
-      table.insert( PositionList, WDG['POSITION' .. PositionIndex])
-      PositionIndex = PositionIndex + 1
-   end
-   local AreaList = WinCreate.AddSplits(WDG.AREAID, WDG.SPLITORIENTATION, WDG.MEASURETYPE, PositionList, WDG.PROPORTION, WDG.SPLITTYPE)
-   for AreaIndex = 1, #AreaList do
-      WDG['AREAID' .. AreaIndex] = AreaList[ AreaIndex]
-   end
-   PositionIndex = 1
-   while WDG['POSITION' .. PositionIndex] do
-      WDG['POSITION' .. PositionIndex] = nil
-      PositionIndex = PositionIndex + 1
-   end
+   local PositionList = GetVariableList( 'POSITION')
+   local AreaList = WinCreate.AddSplits( WDG.AREAID, WDG.SPLITORIENTATION, WDG.MEASURETYPE, PositionList, false, WDG.AREANBR)
+   FillVariableList( 'AREAID', AreaList)
+   CleanVariableList( 'POSITION')
 end
 _G.WinCreate_AddSplits = WinCreate_AddSplits
 
 ----------------------------------------------------------------------------------
 local function WinCreate_AddGridSplits()
-   local AreaIndex = 1
-   while WDG['AREAID' .. AreaIndex] do
-      WDG['AREAID' .. AreaIndex] = nil
-      AreaIndex = AreaIndex + 1
-   end
-   local PositionListVert = {}
-   local PositionIndex = 1
-   while WDG['POSITION_VERT' .. PositionIndex] do
-      table.insert( PositionListVert, WDG['POSITION' .. PositionIndex])
-      PositionIndex = PositionIndex + 1
-   end
-   local PositionListHoriz = {}
-   PositionIndex = 1
-   while WDG['POSITION_HORIZ' .. PositionIndex] do
-      table.insert( PositionListHoriz, WDG['POSITION' .. PositionIndex])
-      PositionIndex = PositionIndex + 1
-   end
-   local AreaList = WinCreate.AddGridSplits(WDG.AREAID, WDG.MEASURETYPE, PositionListVert, PositionListHoriz, WDG.STARTVERTICAL, WDG.SPLITTYPE)
-   for AreaIndex = 1, #AreaList do
-      WDG['AREAID' .. AreaIndex] = AreaList[ AreaIndex]
-   end
-   PositionIndex = 1
-   while WDG['POSITION_VERT' .. PositionIndex] do
-      WDG['POSITION_VERT' .. PositionIndex] = nil
-      PositionIndex = PositionIndex + 1
-   end
-   PositionIndex = 1
-   while WDG['POSITION_HORIZ' .. PositionIndex] do
-      WDG['POSITION_HORIZ' .. PositionIndex] = nil
-      PositionIndex = PositionIndex + 1
-   end
+   local PositionListVert = GetVariableList( 'POSITION_VERT')
+   local PositionListHoriz = GetVariableList( 'POSITION_HORIZ')
+   
+   local AreaList = WinCreate.AddGridSplits( WDG.AREAID, WDG.MEASURETYPE, PositionListVert, PositionListHoriz, WDG.STARTVERTICAL, WDG.AREANBR)
+   FillVariableList( 'AREAID', AreaList)
+   
+   CleanVariableList( 'POSITION_VERT')
+   CleanVariableList( 'POSITION_HORIZ')
 end
 _G.WinCreate_AddGridSplits = WinCreate_AddGridSplits