diff --git a/Test.UI/Data/AntaDoppia.jwd b/Test.UI/Data/AntaDoppia.jwd index 68dfb32..83df841 100644 --- a/Test.UI/Data/AntaDoppia.jwd +++ b/Test.UI/Data/AntaDoppia.jwd @@ -5,7 +5,6 @@ "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { - "IdGroup": 1, "Shape": "RECTANGLE", "DimensionList": [ { @@ -39,19 +38,19 @@ ], "BottomRail": false, "BottomRailQty": 0, + "IdGroup": 1, "AreaList": [ { - "IdGroup": 2, "bIsSashVertical": true, "SashList": [ { - "SashId": 1, + "nSashId": 1, "OpeningType": "TURNONLY_LEFT", "bHasHandle": false, "dDimension": 50.0 }, { - "SashId": 2, + "nSashId": 2, "OpeningType": "TILTTURN_RIGHT", "bHasHandle": true, "dDimension": 50.0 @@ -77,6 +76,7 @@ } ], "Hardware": "000558", + "IdGroup": 2, "AreaList": [ { "IdGroup": 3, @@ -94,8 +94,8 @@ "IdGroup": 5, "AreaList": [ { - "IdGroup": 6, "FillType": "GLASS", + "IdGroup": 6, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/AntaSingola.jwd b/Test.UI/Data/AntaSingola.jwd index 5748335..363ec74 100644 --- a/Test.UI/Data/AntaSingola.jwd +++ b/Test.UI/Data/AntaSingola.jwd @@ -1,8 +1,8 @@ { "ProfilePath": "Profilo78", - "Material": "Pine", + "Material": "Pino", "ColorMaterial": "Black", - "Glass": "4T/16/4T", + "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { "Shape": "RECTANGLE", @@ -44,7 +44,7 @@ "bIsSashVertical": true, "SashList": [ { - "SashId": 1, + "nSashId": 1, "OpeningType": "TILTTURN_LEFT", "bHasHandle": true, "dDimension": 100.0 diff --git a/Test.UI/Data/FinDueAnteBottomFisso.jwd b/Test.UI/Data/FinDueAnteBottomFisso.jwd index 2940a11..6b19f59 100644 --- a/Test.UI/Data/FinDueAnteBottomFisso.jwd +++ b/Test.UI/Data/FinDueAnteBottomFisso.jwd @@ -1,11 +1,10 @@ { "ProfilePath": "Profilo78", - "Material": "Pine", + "Material": "Pino", "ColorMaterial": "Black", - "Glass": "4T/16/4T", + "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { - "IdGroup": 1, "Shape": "RECTANGLE", "DimensionList": [ { @@ -39,11 +38,11 @@ ], "BottomRail": false, "BottomRailQty": 0, + "IdGroup": 1, "AreaList": [ { - "IdGroup": 2, "SplitShape": "HORIZONTAL", - "SplitStartVert": false, + "SplitStartVert": false, "SplitVertList": [], "SplitHorizList": [ { @@ -55,13 +54,14 @@ "dDimension": 60.0 } ], + "IdGroup": 2, "AreaList": [ { "IdGroup": 3, "AreaList": [ { - "IdGroup": 4, "FillType": "GLASS", + "IdGroup": 4, "AreaList": [], "AreaType": "FILL" } @@ -72,17 +72,16 @@ "IdGroup": 5, "AreaList": [ { - "IdGroup": 6, "bIsSashVertical": true, "SashList": [ { - "SashId": 1, + "nSashId": 1, "OpeningType": "TURNONLY_LEFT", "bHasHandle": false, "dDimension": 50.0 }, { - "SashId": 2, + "nSashId": 2, "OpeningType": "TILTTURN_RIGHT", "bHasHandle": true, "dDimension": 50.0 @@ -108,13 +107,14 @@ } ], "Hardware": "000559", + "IdGroup": 6, "AreaList": [ { "IdGroup": 7, "AreaList": [ { - "IdGroup": 8, "FillType": "GLASS", + "IdGroup": 8, "AreaList": [], "AreaType": "FILL" } @@ -125,8 +125,8 @@ "IdGroup": 9, "AreaList": [ { - "IdGroup": 10, "FillType": "GLASS", + "IdGroup": 10, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraDueAnteSeparate.jwd b/Test.UI/Data/FinestraDueAnteSeparate.jwd index b051b18..5bedcb0 100644 --- a/Test.UI/Data/FinestraDueAnteSeparate.jwd +++ b/Test.UI/Data/FinestraDueAnteSeparate.jwd @@ -1,11 +1,10 @@ { "ProfilePath": "Profilo78", - "Material": "Pine", + "Material": "Pino", "ColorMaterial": "Black", - "Glass": "4T/16/4T", + "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { - "IdGroup": 1, "Shape": "DOUBLECHAMFER", "DimensionList": [ { @@ -44,11 +43,11 @@ ], "BottomRail": false, "BottomRailQty": 0, + "IdGroup": 1, "AreaList": [ { - "IdGroup": 2, "SplitShape": "VERTICAL", - "SplitStartVert": true, + "SplitStartVert": true, "SplitVertList": [ { "bIsRelative": true, @@ -60,16 +59,16 @@ } ], "SplitHorizList": [], + "IdGroup": 2, "AreaList": [ { "IdGroup": 3, "AreaList": [ { - "IdGroup": 4, "bIsSashVertical": true, "SashList": [ { - "SashId": 1, + "nSashId": 1, "OpeningType": "TILTTURN_LEFT", "bHasHandle": true, "dDimension": 100.0 @@ -97,10 +96,11 @@ "BottomRail": false, "BottomRailQty": 0, "Hardware": "000000", + "IdGroup": 4, "AreaList": [ { - "IdGroup": 5, "FillType": "GLASS", + "IdGroup": 5, "AreaList": [], "AreaType": "FILL" } @@ -114,11 +114,10 @@ "IdGroup": 6, "AreaList": [ { - "IdGroup": 7, "bIsSashVertical": true, "SashList": [ { - "SashId": 1, + "nSashId": 1, "OpeningType": "TILTTURN_RIGHT", "bHasHandle": true, "dDimension": 100.0 @@ -146,10 +145,11 @@ "BottomRail": false, "BottomRailQty": 0, "Hardware": "000000", + "IdGroup": 7, "AreaList": [ { - "IdGroup": 8, "FillType": "GLASS", + "IdGroup": 8, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraSplitGrid.jwd b/Test.UI/Data/FinestraSplitGrid.jwd index 6f5f99e..ba61d49 100644 --- a/Test.UI/Data/FinestraSplitGrid.jwd +++ b/Test.UI/Data/FinestraSplitGrid.jwd @@ -1,11 +1,10 @@ { "ProfilePath": "Profilo78", - "Material": "Pine", + "Material": "Pino", "ColorMaterial": "Black", - "Glass": "4T/16/4T", + "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { - "IdGroup": 1, "Shape": "RECTANGLE", "DimensionList": [ { @@ -39,9 +38,9 @@ ], "BottomRail": false, "BottomRailQty": 0, + "IdGroup": 1, "AreaList": [ { - "IdGroup": 2, "SplitShape": "GRID", "SplitStartVert": false, "SplitVertList": [ @@ -68,13 +67,14 @@ "dDimension": 30.0 } ], + "IdGroup": 2, "AreaList": [ { "IdGroup": 3, "AreaList": [ { - "IdGroup": 4, "FillType": "GLASS", + "IdGroup": 4, "AreaList": [], "AreaType": "FILL" } @@ -85,8 +85,8 @@ "IdGroup": 5, "AreaList": [ { - "IdGroup": 6, "FillType": "GLASS", + "IdGroup": 6, "AreaList": [], "AreaType": "FILL" } @@ -97,8 +97,8 @@ "IdGroup": 7, "AreaList": [ { - "IdGroup": 8, "FillType": "GLASS", + "IdGroup": 8, "AreaList": [], "AreaType": "FILL" } @@ -109,8 +109,8 @@ "IdGroup": 9, "AreaList": [ { - "IdGroup": 10, "FillType": "GLASS", + "IdGroup": 10, "AreaList": [], "AreaType": "FILL" } @@ -121,8 +121,8 @@ "IdGroup": 11, "AreaList": [ { - "IdGroup": 12, "FillType": "GLASS", + "IdGroup": 12, "AreaList": [], "AreaType": "FILL" } @@ -133,8 +133,8 @@ "IdGroup": 13, "AreaList": [ { - "IdGroup": 14, "FillType": "GLASS", + "IdGroup": 14, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraSplitVert.jwd b/Test.UI/Data/FinestraSplitVert.jwd index 60e1e4b..2651f19 100644 --- a/Test.UI/Data/FinestraSplitVert.jwd +++ b/Test.UI/Data/FinestraSplitVert.jwd @@ -1,11 +1,10 @@ { "ProfilePath": "Profilo78", - "Material": "Pine", + "Material": "Pino", "ColorMaterial": "Black", - "Glass": "4T/16/4T", + "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { - "IdGroup": 1, "Shape": "RECTANGLE", "DimensionList": [ { @@ -39,9 +38,9 @@ ], "BottomRail": false, "BottomRailQty": 0, + "IdGroup": 1, "AreaList": [ { - "IdGroup": 2, "SplitShape": "VERTICAL", "SplitStartVert": true, "SplitVertList": [ @@ -55,13 +54,14 @@ } ], "SplitHorizList": [], + "IdGroup": 2, "AreaList": [ { "IdGroup": 3, "AreaList": [ { - "IdGroup": 4, "FillType": "GLASS", + "IdGroup": 4, "AreaList": [], "AreaType": "FILL" } @@ -72,8 +72,8 @@ "IdGroup": 5, "AreaList": [ { - "IdGroup": 6, "FillType": "GLASS", + "IdGroup": 6, "AreaList": [], "AreaType": "FILL" } diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index d547d47..2955a90 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -109,6 +109,8 @@ + + diff --git a/WebWindowComplex/Window.cs b/WebWindowComplex/Window.cs index ddfb77f..19eabd2 100644 --- a/WebWindowComplex/Window.cs +++ b/WebWindowComplex/Window.cs @@ -1143,6 +1143,7 @@ namespace WebWindowComplex m_SelHardware = m_HardwareList.FirstOrDefault(x => x.Id == sId) ?? new Hardware("", "", "", "", "", 0, 0); if (m_SelHardware == null) m_SelHardware = m_HardwareList[0]; + //Sash.s_SelFamilyHW = m_SelHardware.FamilyName; } public int SelHardwareTypeIndex diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 8c58966..ca006c6 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -123,6 +123,9 @@ + + +