From bb140410caf5a835edd287e8ac2b610dd17f7baf Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Thu, 5 Mar 2026 18:50:58 +0100 Subject: [PATCH] Aggiornati jwd di esempio --- Test.UI/Data/AntaDoppiaInglesine.jwd | 33 ++++++- Test.UI/Data/AntaSingola.jwd | 21 ++--- Test.UI/Data/ArcoAntaDoppia.jwd | 19 ++-- Test.UI/Data/FinDueAnteBottomFisso.jwd | 56 +++++++----- Test.UI/Data/FinestraDueAnteSeparate.jwd | 90 +++++++------------ Test.UI/Data/FinestraSplitGrid.jwd | 55 ++++++------ Test.UI/Data/FinestraSplitHoriz.jwd | 18 ++-- Test.UI/Data/FinestraSplitVert.jwd | 18 ++-- WebWindowComplex/WebWindowComplex.csproj | 2 + .../WebWindowConfigurator.csproj | 3 + 10 files changed, 168 insertions(+), 147 deletions(-) diff --git a/Test.UI/Data/AntaDoppiaInglesine.jwd b/Test.UI/Data/AntaDoppiaInglesine.jwd index 5fafd93..d81929a 100644 --- a/Test.UI/Data/AntaDoppiaInglesine.jwd +++ b/Test.UI/Data/AntaDoppiaInglesine.jwd @@ -186,7 +186,7 @@ "ElementDimHorizList": [ { "Index": 1, - "Value": 78.0, + "Value": 60.0, "Area": 0 } ], @@ -206,7 +206,36 @@ { "FillType": "GLASS", "GroupId": 6, - "AreaList": [], + "AreaList": [ + { + "SplitShape": "HORIZONTAL", + "SplitStartVert": false, + "SplitVertList": [], + "SplitHorizList": [ + { + "IsRelative": true, + "Dimension": 50.0, + "MeasureType": "PERCENTAGE" + }, + { + "IsRelative": true, + "Dimension": 50.0, + "MeasureType": "PERCENTAGE" + } + ], + "ElementDimVertList": [], + "ElementDimHorizList": [ + { + "Index": 1, + "Value": 60.0, + "Area": 0 + } + ], + "GroupId": 8, + "AreaList": [], + "AreaType": "SPLIT" + } + ], "AreaType": "FILL" } ], diff --git a/Test.UI/Data/AntaSingola.jwd b/Test.UI/Data/AntaSingola.jwd index 7f7f25e..d24dcfa 100644 --- a/Test.UI/Data/AntaSingola.jwd +++ b/Test.UI/Data/AntaSingola.jwd @@ -57,17 +57,19 @@ "Threshold": "Bottom", "BottomRail": false, "BottomRailQty": 0, + "BottomRailElemDimList": [], "GroupId": 1, "AreaList": [ { "IsSashVertical": true, + "IsDimensionLight": true, "SashList": [ { "SashId": 1, "OpeningType": "TILTTURN_LEFT", + "MeasureType": "PROPORTIONAL", + "Dimension": 1.0, "HasHandle": true, - "Dimension": 100.0, - "MeasureType": "PERCENTAGE", "ElementDimensionList": [ { "Index": 1, @@ -107,7 +109,10 @@ } ], "SashType": "NULL", - "Hardware": "000635", + "BottomRail": false, + "BottomRailQty": 0, + "BottomRailElemDimList": [], + "Hardware": "000623", "HwOptionList": [ { "Name": "Entrata", @@ -119,11 +124,7 @@ }, { "Name": "PosizioneForoCilindro", - "Value": "sotto" - }, - { - "Name": "Deviatore", - "Value": "false" + "Value": "sopra" }, { "Name": "ModelloCilindro", @@ -135,14 +136,14 @@ }, { "Name": "HMan", - "Value": "400" + "Value": "500" } ], "GroupId": 2, "AreaList": [ { "FillType": "GLASS", - "GroupId": 3, + "GroupId": 4, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/ArcoAntaDoppia.jwd b/Test.UI/Data/ArcoAntaDoppia.jwd index 0a652f2..584e9b4 100644 --- a/Test.UI/Data/ArcoAntaDoppia.jwd +++ b/Test.UI/Data/ArcoAntaDoppia.jwd @@ -15,7 +15,7 @@ { "Index": 2, "Name": "Height", - "Value": 1500.0 + "Value": 1480.0 }, { "Index": 3, @@ -59,20 +59,22 @@ "JointType": "ANGLED" } ], - "Threshold": "Threshold", + "Threshold": "Bottom", "BottomRail": false, "BottomRailQty": 0, + "BottomRailElemDimList": [], "GroupId": 1, "AreaList": [ { "IsSashVertical": true, + "IsDimensionLight": true, "SashList": [ { "SashId": 1, "OpeningType": "TILTTURN_LEFT", + "MeasureType": "PROPORTIONAL", + "Dimension": 1.0, "HasHandle": true, - "Dimension": 50.0, - "MeasureType": "PERCENTAGE", "ElementDimensionList": [ { "Index": 1, @@ -113,9 +115,9 @@ { "SashId": 2, "OpeningType": "TURNONLY_RIGHT", + "MeasureType": "PROPORTIONAL", + "Dimension": 1.0, "HasHandle": false, - "Dimension": 50.0, - "MeasureType": "PERCENTAGE", "ElementDimensionList": [ { "Index": 1, @@ -157,16 +159,17 @@ "SashType": "NULL", "BottomRail": false, "BottomRailQty": 0, + "BottomRailElemDimList": [], "Hardware": "000644", "HwOptionList": [], "GroupId": 2, "AreaList": [ { - "GroupId": 4, + "GroupId": 3, "AreaList": [ { "FillType": "GLASS", - "GroupId": 3, + "GroupId": 4, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinDueAnteBottomFisso.jwd b/Test.UI/Data/FinDueAnteBottomFisso.jwd index 6773b75..a543f83 100644 --- a/Test.UI/Data/FinDueAnteBottomFisso.jwd +++ b/Test.UI/Data/FinDueAnteBottomFisso.jwd @@ -10,12 +10,12 @@ { "Index": 1, "Name": "Width", - "Value": 1500.0 + "Value": 800.0 }, { "Index": 2, "Name": "Height", - "Value": 2100.0 + "Value": 1200.0 } ], "ElementDimensionList": [ @@ -57,6 +57,7 @@ "Threshold": "Bottom", "BottomRail": false, "BottomRailQty": 0, + "BottomRailElemDimList": [], "GroupId": 1, "AreaList": [ { @@ -66,28 +67,31 @@ "SplitHorizList": [ { "IsRelative": true, - "Dimension": 40.0 + "Dimension": 50.0, + "MeasureType": "PERCENTAGE" }, { "IsRelative": true, - "Dimension": 60.0 + "Dimension": 50.0, + "MeasureType": "PERCENTAGE" } ], "ElementDimVertList": [], "ElementDimHorizList": [ { "Index": 1, - "Value": 78.0 + "Value": 78.0, + "Area": 0 } ], - "GroupId": 2, + "GroupId": 7, "AreaList": [ { - "GroupId": 3, + "GroupId": 9, "AreaList": [ { "FillType": "GLASS", - "GroupId": 4, + "GroupId": 10, "AreaList": [], "AreaType": "FILL" } @@ -95,17 +99,18 @@ "AreaType": "SPLITTED" }, { - "GroupId": 5, + "GroupId": 8, "AreaList": [ { "IsSashVertical": true, + "IsDimensionLight": true, "SashList": [ { "SashId": 1, - "OpeningType": "TURNONLY_LEFT", - "HasHandle": false, - "Dimension": 50.0, - "MeasureType": "PERCENTAGE", + "OpeningType": "TILTTURN_LEFT", + "MeasureType": "PROPORTIONAL", + "Dimension": 1.0, + "HasHandle": true, "ElementDimensionList": [ { "Index": 1, @@ -145,10 +150,10 @@ }, { "SashId": 2, - "OpeningType": "TILTTURN_RIGHT", - "HasHandle": true, - "Dimension": 50.0, - "MeasureType": "PERCENTAGE", + "OpeningType": "TURNONLY_RIGHT", + "MeasureType": "PROPORTIONAL", + "Dimension": 1.0, + "HasHandle": false, "ElementDimensionList": [ { "Index": 1, @@ -188,6 +193,9 @@ } ], "SashType": "NULL", + "BottomRail": false, + "BottomRailQty": 0, + "BottomRailElemDimList": [], "Hardware": "000631", "HwOptionList": [ { @@ -200,7 +208,7 @@ }, { "Name": "PosizioneForoCilindro", - "Value": "sotto" + "Value": "sopra" }, { "Name": "Deviatore", @@ -216,17 +224,17 @@ }, { "Name": "HMan", - "Value": "400" + "Value": "170" } ], - "GroupId": 6, + "GroupId": 2, "AreaList": [ { - "GroupId": 7, + "GroupId": 3, "AreaList": [ { "FillType": "GLASS", - "GroupId": 8, + "GroupId": 4, "AreaList": [], "AreaType": "FILL" } @@ -234,11 +242,11 @@ "AreaType": "SPLITTED" }, { - "GroupId": 9, + "GroupId": 5, "AreaList": [ { "FillType": "GLASS", - "GroupId": 10, + "GroupId": 6, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraDueAnteSeparate.jwd b/Test.UI/Data/FinestraDueAnteSeparate.jwd index d945efe..a25d7b6 100644 --- a/Test.UI/Data/FinestraDueAnteSeparate.jwd +++ b/Test.UI/Data/FinestraDueAnteSeparate.jwd @@ -5,22 +5,17 @@ "Glass": "Vetro BE 2S 4T/16/4T", "AreaList": [ { - "Shape": "DOUBLECHAMFER", + "Shape": "RECTANGLE", "DimensionList": [ { "Index": 1, "Name": "Width", - "Value": 1500.0 + "Value": 800.0 }, { "Index": 2, "Name": "Height", - "Value": 1500.0 - }, - { - "Index": 3, - "Name": "Full Height", - "Value": 1800.0 + "Value": 1200.0 } ], "ElementDimensionList": [ @@ -62,6 +57,7 @@ "Threshold": "Bottom", "BottomRail": false, "BottomRailQty": 0, + "BottomRailElemDimList": [], "GroupId": 1, "AreaList": [ { @@ -70,35 +66,39 @@ "SplitVertList": [ { "IsRelative": true, - "Dimension": 50.0 + "Dimension": 50.0, + "MeasureType": "PERCENTAGE" }, { "IsRelative": true, - "Dimension": 50.0 + "Dimension": 50.0, + "MeasureType": "PERCENTAGE" } ], "SplitHorizList": [], "ElementDimVertList": [ { "Index": 1, - "Value": 78.0 + "Value": 85.0, + "Area": 0 } ], "ElementDimHorizList": [], - "GroupId": 2, + "GroupId": 5, "AreaList": [ { - "GroupId": 3, + "GroupId": 6, "AreaList": [ { "IsSashVertical": true, + "IsDimensionLight": true, "SashList": [ { "SashId": 1, "OpeningType": "TILTTURN_LEFT", + "MeasureType": "PROPORTIONAL", + "Dimension": 1.0, "HasHandle": true, - "Dimension": 100.0, - "MeasureType": "PERCENTAGE", "ElementDimensionList": [ { "Index": 1, @@ -140,7 +140,8 @@ "SashType": "NULL", "BottomRail": false, "BottomRailQty": 0, - "Hardware": "000000", + "BottomRailElemDimList": [], + "Hardware": "000635", "HwOptionList": [ { "Name": "Entrata", @@ -152,11 +153,7 @@ }, { "Name": "PosizioneForoCilindro", - "Value": "sotto" - }, - { - "Name": "Deviatore", - "Value": "false" + "Value": "sopra" }, { "Name": "ModelloCilindro", @@ -168,14 +165,14 @@ }, { "Name": "HMan", - "Value": "400" + "Value": "500" } ], - "GroupId": 4, + "GroupId": 2, "AreaList": [ { "FillType": "GLASS", - "GroupId": 5, + "GroupId": 4, "AreaList": [], "AreaType": "FILL" } @@ -186,17 +183,18 @@ "AreaType": "SPLITTED" }, { - "GroupId": 6, + "GroupId": 7, "AreaList": [ { "IsSashVertical": true, + "IsDimensionLight": false, "SashList": [ { "SashId": 1, - "OpeningType": "TILTTURN_RIGHT", - "HasHandle": true, - "Dimension": 100.0, + "OpeningType": "TILTTURN_LEFT", "MeasureType": "PERCENTAGE", + "Dimension": 100.0, + "HasHandle": true, "ElementDimensionList": [ { "Index": 1, @@ -238,38 +236,10 @@ "SashType": "NULL", "BottomRail": false, "BottomRailQty": 0, - "Hardware": "000000", - "HwOptionList": [ - { - "Name": "Entrata", - "Value": "15" - }, - { - "Name": "LavManigliaPassante", - "Value": "false" - }, - { - "Name": "PosizioneForoCilindro", - "Value": "sotto" - }, - { - "Name": "Deviatore", - "Value": "false" - }, - { - "Name": "ModelloCilindro", - "Value": "c999" - }, - { - "Name": "LavCilindroPassante", - "Value": "false" - }, - { - "Name": "HMan", - "Value": "400" - } - ], - "GroupId": 7, + "BottomRailElemDimList": [], + "Hardware": "000635", + "HwOptionList": [], + "GroupId": 9, "AreaList": [ { "FillType": "GLASS", diff --git a/Test.UI/Data/FinestraSplitGrid.jwd b/Test.UI/Data/FinestraSplitGrid.jwd index 0df35d6..021bbff 100644 --- a/Test.UI/Data/FinestraSplitGrid.jwd +++ b/Test.UI/Data/FinestraSplitGrid.jwd @@ -57,67 +57,68 @@ "Threshold": "Bottom", "BottomRail": false, "BottomRailQty": 0, + "BottomRailElemDimList": [], "GroupId": 1, "AreaList": [ { "SplitShape": "GRID", - "SplitStartVert": true, + "SplitStartVert": false, "SplitVertList": [ { "IsRelative": true, - "Dimension": 50.0, - "MeasureType": "PERCENTAGE" + "Dimension": 1.0, + "MeasureType": "PROPORTIONAL" }, { "IsRelative": true, - "Dimension": 50.0, - "MeasureType": "PERCENTAGE" + "Dimension": 1.0, + "MeasureType": "PROPORTIONAL" } ], "SplitHorizList": [ { "IsRelative": true, - "Dimension": 30.0, - "MeasureType": "PERCENTAGE" + "Dimension": 1.0, + "MeasureType": "PROPORTIONAL" }, { "IsRelative": true, - "Dimension": 40.0, - "MeasureType": "PERCENTAGE" + "Dimension": 1.0, + "MeasureType": "PROPORTIONAL" }, { "IsRelative": true, - "Dimension": 30.0, - "MeasureType": "PERCENTAGE" + "Dimension": 1.0, + "MeasureType": "PROPORTIONAL" } ], "ElementDimVertList": [ { "Index": 1, "Value": 78.0, - "Area": 0 + "Area": 1 } ], "ElementDimHorizList": [ { "Index": 1, "Value": 78.0, - "Area": 1 + "Area": 0 }, { "Index": 2, "Value": 78.0, - "Area": 1 + "Area": 0 } ], - "GroupId": 2, + "GroupId": 8, "AreaList": [ { - "GroupId": 3, + "GroupId": 12, "AreaList": [ { "FillType": "GLASS", - "GroupId": 4, + "GroupId": 13, "AreaList": [], "AreaType": "FILL" } @@ -125,11 +126,11 @@ "AreaType": "SPLITTED" }, { - "GroupId": 5, + "GroupId": 14, "AreaList": [ { "FillType": "GLASS", - "GroupId": 6, + "GroupId": 15, "AreaList": [], "AreaType": "FILL" } @@ -137,11 +138,11 @@ "AreaType": "SPLITTED" }, { - "GroupId": 7, + "GroupId": 16, "AreaList": [ { "FillType": "GLASS", - "GroupId": 8, + "GroupId": 17, "AreaList": [], "AreaType": "FILL" } @@ -149,11 +150,11 @@ "AreaType": "SPLITTED" }, { - "GroupId": 9, + "GroupId": 18, "AreaList": [ { "FillType": "GLASS", - "GroupId": 10, + "GroupId": 19, "AreaList": [], "AreaType": "FILL" } @@ -161,11 +162,11 @@ "AreaType": "SPLITTED" }, { - "GroupId": 11, + "GroupId": 20, "AreaList": [ { "FillType": "GLASS", - "GroupId": 12, + "GroupId": 21, "AreaList": [], "AreaType": "FILL" } @@ -173,11 +174,11 @@ "AreaType": "SPLITTED" }, { - "GroupId": 13, + "GroupId": 22, "AreaList": [ { "FillType": "GLASS", - "GroupId": 14, + "GroupId": 23, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraSplitHoriz.jwd b/Test.UI/Data/FinestraSplitHoriz.jwd index 8ba62c0..15614a1 100644 --- a/Test.UI/Data/FinestraSplitHoriz.jwd +++ b/Test.UI/Data/FinestraSplitHoriz.jwd @@ -10,12 +10,12 @@ { "Index": 1, "Name": "Width", - "Value": 1500.0 + "Value": 800.0 }, { "Index": 2, "Name": "Height", - "Value": 1800.0 + "Value": 1200.0 } ], "ElementDimensionList": [ @@ -57,6 +57,7 @@ "Threshold": "Bottom", "BottomRail": false, "BottomRailQty": 0, + "BottomRailElemDimList": [], "GroupId": 1, "AreaList": [ { @@ -79,17 +80,18 @@ "ElementDimHorizList": [ { "Index": 1, - "Value": 78.0 + "Value": 78.0, + "Area": 0 } ], - "GroupId": 2, + "GroupId": 8, "AreaList": [ { - "GroupId": 3, + "GroupId": 9, "AreaList": [ { "FillType": "GLASS", - "GroupId": 4, + "GroupId": 7, "AreaList": [], "AreaType": "FILL" } @@ -97,11 +99,11 @@ "AreaType": "SPLITTED" }, { - "GroupId": 5, + "GroupId": 10, "AreaList": [ { "FillType": "GLASS", - "GroupId": 6, + "GroupId": 11, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraSplitVert.jwd b/Test.UI/Data/FinestraSplitVert.jwd index 0acd85c..1d98e14 100644 --- a/Test.UI/Data/FinestraSplitVert.jwd +++ b/Test.UI/Data/FinestraSplitVert.jwd @@ -10,12 +10,12 @@ { "Index": 1, "Name": "Width", - "Value": 1500.0 + "Value": 800.0 }, { "Index": 2, "Name": "Height", - "Value": 1800.0 + "Value": 1200.0 } ], "ElementDimensionList": [ @@ -57,6 +57,7 @@ "Threshold": "Bottom", "BottomRail": false, "BottomRailQty": 0, + "BottomRailElemDimList": [], "GroupId": 1, "AreaList": [ { @@ -78,18 +79,19 @@ "ElementDimVertList": [ { "Index": 1, - "Value": 78.0 + "Value": 78.0, + "Area": 0 } ], "ElementDimHorizList": [], - "GroupId": 2, + "GroupId": 8, "AreaList": [ { - "GroupId": 3, + "GroupId": 9, "AreaList": [ { "FillType": "GLASS", - "GroupId": 4, + "GroupId": 7, "AreaList": [], "AreaType": "FILL" } @@ -97,11 +99,11 @@ "AreaType": "SPLITTED" }, { - "GroupId": 5, + "GroupId": 10, "AreaList": [ { "FillType": "GLASS", - "GroupId": 6, + "GroupId": 11, "AreaList": [], "AreaType": "FILL" } diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 7d0d906..159063c 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -294,6 +294,8 @@ + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index f29d27b..b46ec71 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -245,6 +245,9 @@ + + +