From aa956217ebf8bc8109fd5694d353f3915ada61c7 Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Wed, 22 Oct 2025 17:00:44 +0200 Subject: [PATCH] Aggiornato nome IdGroup in GroupId --- Test.UI/Data/AntaDoppia.jwd | 12 +++--- Test.UI/Data/AntaSingola.jwd | 6 +-- Test.UI/Data/FinDueAnteBottomFisso.jwd | 20 +++++----- Test.UI/Data/FinestraDueAnteSeparate.jwd | 16 ++++---- Test.UI/Data/FinestraSplitGrid.jwd | 28 +++++++------- Test.UI/Data/FinestraSplitVert.jwd | 12 +++--- WebWindowComplex/Json/JsonUtility.cs | 38 +++++++++---------- WebWindowComplex/Models/Area.cs | 4 +- WebWindowComplex/Models/Fill.cs | 4 +- WebWindowComplex/Models/Sash.cs | 4 +- WebWindowComplex/Models/Split.cs | 4 +- WebWindowComplex/Models/Splitted.cs | 4 +- WebWindowComplex/WebWindowComplex.csproj | 2 + .../WebWindowConfigurator.csproj | 2 + 14 files changed, 80 insertions(+), 76 deletions(-) diff --git a/Test.UI/Data/AntaDoppia.jwd b/Test.UI/Data/AntaDoppia.jwd index daa1816..b81a6b1 100644 --- a/Test.UI/Data/AntaDoppia.jwd +++ b/Test.UI/Data/AntaDoppia.jwd @@ -38,7 +38,7 @@ ], "BottomRail": false, "BottomRailQty": 0, - "IdGroup": 1, + "GroupId": 1, "AreaList": [ { "bIsSashVertical": true, @@ -76,13 +76,13 @@ } ], "Hardware": "000631", - "IdGroup": 2, + "GroupId": 2, "AreaList": [ { - "IdGroup": 3, + "GroupId": 3, "AreaList": [ { - "IdGroup": 4, + "GroupId": 4, "FillType": "GLASS", "AreaList": [], "AreaType": "FILL" @@ -91,11 +91,11 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 5, + "GroupId": 5, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 6, + "GroupId": 6, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/AntaSingola.jwd b/Test.UI/Data/AntaSingola.jwd index 60f3330..6252894 100644 --- a/Test.UI/Data/AntaSingola.jwd +++ b/Test.UI/Data/AntaSingola.jwd @@ -38,7 +38,7 @@ ], "BottomRail": false, "BottomRailQty": 0, - "IdGroup": 1, + "GroupId": 1, "AreaList": [ { "bIsSashVertical": true, @@ -70,11 +70,11 @@ } ], "Hardware": "000635", - "IdGroup": 2, + "GroupId": 2, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 3, + "GroupId": 3, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinDueAnteBottomFisso.jwd b/Test.UI/Data/FinDueAnteBottomFisso.jwd index f36e5e4..2131e76 100644 --- a/Test.UI/Data/FinDueAnteBottomFisso.jwd +++ b/Test.UI/Data/FinDueAnteBottomFisso.jwd @@ -38,7 +38,7 @@ ], "BottomRail": false, "BottomRailQty": 0, - "IdGroup": 1, + "GroupId": 1, "AreaList": [ { "SplitShape": "HORIZONTAL", @@ -54,14 +54,14 @@ "dDimension": 60.0 } ], - "IdGroup": 2, + "GroupId": 2, "AreaList": [ { - "IdGroup": 3, + "GroupId": 3, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 4, + "GroupId": 4, "AreaList": [], "AreaType": "FILL" } @@ -69,7 +69,7 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 5, + "GroupId": 5, "AreaList": [ { "bIsSashVertical": true, @@ -107,14 +107,14 @@ } ], "Hardware": "000631", - "IdGroup": 6, + "GroupId": 6, "AreaList": [ { - "IdGroup": 7, + "GroupId": 7, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 8, + "GroupId": 8, "AreaList": [], "AreaType": "FILL" } @@ -122,11 +122,11 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 9, + "GroupId": 9, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 10, + "GroupId": 10, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraDueAnteSeparate.jwd b/Test.UI/Data/FinestraDueAnteSeparate.jwd index 5bedcb0..c8f8e3a 100644 --- a/Test.UI/Data/FinestraDueAnteSeparate.jwd +++ b/Test.UI/Data/FinestraDueAnteSeparate.jwd @@ -43,7 +43,7 @@ ], "BottomRail": false, "BottomRailQty": 0, - "IdGroup": 1, + "GroupId": 1, "AreaList": [ { "SplitShape": "VERTICAL", @@ -59,10 +59,10 @@ } ], "SplitHorizList": [], - "IdGroup": 2, + "GroupId": 2, "AreaList": [ { - "IdGroup": 3, + "GroupId": 3, "AreaList": [ { "bIsSashVertical": true, @@ -96,11 +96,11 @@ "BottomRail": false, "BottomRailQty": 0, "Hardware": "000000", - "IdGroup": 4, + "GroupId": 4, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 5, + "GroupId": 5, "AreaList": [], "AreaType": "FILL" } @@ -111,7 +111,7 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 6, + "GroupId": 6, "AreaList": [ { "bIsSashVertical": true, @@ -145,11 +145,11 @@ "BottomRail": false, "BottomRailQty": 0, "Hardware": "000000", - "IdGroup": 7, + "GroupId": 7, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 8, + "GroupId": 8, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraSplitGrid.jwd b/Test.UI/Data/FinestraSplitGrid.jwd index ba61d49..07d1781 100644 --- a/Test.UI/Data/FinestraSplitGrid.jwd +++ b/Test.UI/Data/FinestraSplitGrid.jwd @@ -38,7 +38,7 @@ ], "BottomRail": false, "BottomRailQty": 0, - "IdGroup": 1, + "GroupId": 1, "AreaList": [ { "SplitShape": "GRID", @@ -67,14 +67,14 @@ "dDimension": 30.0 } ], - "IdGroup": 2, + "GroupId": 2, "AreaList": [ { - "IdGroup": 3, + "GroupId": 3, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 4, + "GroupId": 4, "AreaList": [], "AreaType": "FILL" } @@ -82,11 +82,11 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 5, + "GroupId": 5, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 6, + "GroupId": 6, "AreaList": [], "AreaType": "FILL" } @@ -94,11 +94,11 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 7, + "GroupId": 7, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 8, + "GroupId": 8, "AreaList": [], "AreaType": "FILL" } @@ -106,11 +106,11 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 9, + "GroupId": 9, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 10, + "GroupId": 10, "AreaList": [], "AreaType": "FILL" } @@ -118,11 +118,11 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 11, + "GroupId": 11, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 12, + "GroupId": 12, "AreaList": [], "AreaType": "FILL" } @@ -130,11 +130,11 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 13, + "GroupId": 13, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 14, + "GroupId": 14, "AreaList": [], "AreaType": "FILL" } diff --git a/Test.UI/Data/FinestraSplitVert.jwd b/Test.UI/Data/FinestraSplitVert.jwd index 2651f19..0290ae0 100644 --- a/Test.UI/Data/FinestraSplitVert.jwd +++ b/Test.UI/Data/FinestraSplitVert.jwd @@ -38,7 +38,7 @@ ], "BottomRail": false, "BottomRailQty": 0, - "IdGroup": 1, + "GroupId": 1, "AreaList": [ { "SplitShape": "VERTICAL", @@ -54,14 +54,14 @@ } ], "SplitHorizList": [], - "IdGroup": 2, + "GroupId": 2, "AreaList": [ { - "IdGroup": 3, + "GroupId": 3, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 4, + "GroupId": 4, "AreaList": [], "AreaType": "FILL" } @@ -69,11 +69,11 @@ "AreaType": "SPLITTED" }, { - "IdGroup": 5, + "GroupId": 5, "AreaList": [ { "FillType": "GLASS", - "IdGroup": 6, + "GroupId": 6, "AreaList": [], "AreaType": "FILL" } diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs index 8a67060..70cb19a 100644 --- a/WebWindowComplex/Json/JsonUtility.cs +++ b/WebWindowComplex/Json/JsonUtility.cs @@ -106,17 +106,17 @@ namespace WebWindowComplex.Json public class JsonArea { - private int m_nIdGroup; + private int m_nGroupId; [JsonProperty] - public int IdGroup + public int GroupId { get { - return m_nIdGroup; + return m_nGroupId; } set { - m_nIdGroup = value; + m_nGroupId = value; } } @@ -233,18 +233,18 @@ namespace WebWindowComplex.Json { } - public JsonFrame(Shapes Shape, bool BottomRail, int BottomRailQty, int nIdGroup) : base(AreaTypes.FRAME) + public JsonFrame(Shapes Shape, bool BottomRail, int BottomRailQty, int nGroupId) : base(AreaTypes.FRAME) { m_Shape = Shape; m_bBottomRail = BottomRail; m_nBottomRailQty = BottomRailQty; - IdGroup = nIdGroup; + GroupId = nGroupId; } internal override Area Deserialize(Area ParentArea, Window ParentWindow) { Frame newFrame = new Frame(null, ParentWindow); - newFrame.SetIdGroup(IdGroup); + newFrame.SetGroupId(GroupId); newFrame.SetAreaType(AreaTypes.FRAME); newFrame.SetSelShape(m_Shape); newFrame.SetBottomRail(m_bBottomRail); @@ -371,20 +371,20 @@ namespace WebWindowComplex.Json { } - public JsonSash(bool bIsSashVertical, SashTypes SashType, bool SashBottomRail, int SashBottomRailQty, string Hardware, int nIdGroup) : base(AreaTypes.SASH) + public JsonSash(bool bIsSashVertical, SashTypes SashType, bool SashBottomRail, int SashBottomRailQty, string Hardware, int nGroupId) : base(AreaTypes.SASH) { m_bIsSashVertical = bIsSashVertical; m_SashType = SashType; m_bBottomRail = SashBottomRail; m_nBottomRailQty = SashBottomRailQty; m_Hardware = Hardware; - IdGroup = nIdGroup; + GroupId = nGroupId; } internal override Area Deserialize(Area ParentArea, Window ParentWindow) { Sash newSash = new Sash(ParentArea, ParentWindow); - newSash.SetIdGroup(IdGroup); + newSash.SetGroupId(GroupId); newSash.SetAreaType(AreaTypes.SASH); newSash.SetSashQty(m_SashList.Count); newSash.SetIsSashVertical(m_bIsSashVertical); @@ -476,16 +476,16 @@ namespace WebWindowComplex.Json { } - public JsonSplit(SplitShapes SplitShape, int nIdGroup) : base(AreaTypes.SPLIT) + public JsonSplit(SplitShapes SplitShape, int nGroupId) : base(AreaTypes.SPLIT) { m_SplitShape = SplitShape; - IdGroup = nIdGroup; + GroupId = nGroupId; } internal override Area Deserialize(Area ParentArea, Window ParentWindow) { Split Split = new Split(ParentArea, ParentWindow); - Split.SetIdGroup(IdGroup); + Split.SetGroupId(GroupId); Split.SetAreaType(AreaTypes.SPLIT); Split.SetSplitShape(m_SplitShape, true); Split.SetSplitStartVert(m_SplitStartVert); @@ -530,15 +530,15 @@ namespace WebWindowComplex.Json public JsonSplitted() : base(AreaTypes.SPLITTED) { } - public JsonSplitted(int nIdGroup) : base(AreaTypes.SPLITTED) + public JsonSplitted(int nGroupId) : base(AreaTypes.SPLITTED) { - IdGroup = nIdGroup; + GroupId = nGroupId; } internal override Area Deserialize(Area ParentArea, Window ParentWindow) { Splitted newSplitted = new Splitted(ParentArea, ParentWindow); - newSplitted.SetIdGroup(IdGroup); + newSplitted.SetGroupId(GroupId); newSplitted.SetAreaType(AreaTypes.SPLITTED); //Split.AppliedDone(); foreach (var Area in AreaList) @@ -575,16 +575,16 @@ namespace WebWindowComplex.Json { } - public JsonFill(FillTypes FillType, int nIdGroup) : base(AreaTypes.FILL) + public JsonFill(FillTypes FillType, int nGroupId) : base(AreaTypes.FILL) { m_FillType = FillType; - IdGroup = nIdGroup; + GroupId = nGroupId; } internal override Area Deserialize(Area ParentArea, Window ParentWindow) { Fill Fill = new Fill(ParentArea, ParentWindow); - Fill.SetIdGroup(IdGroup); + Fill.SetGroupId(GroupId); Fill.SetAreaType(AreaTypes.FILL); Fill.SetFillType(m_FillType); //Fill.AppliedDone(); diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index 006f067..babf1b9 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -193,9 +193,9 @@ namespace WebWindowComplex.Models public abstract Area Copy(Area ParentArea); - public void SetIdGroup(int nIdGroup) + public void SetGroupId(int nGroupId) { - m_GroupId = nIdGroup; + m_GroupId = nGroupId; } public void SwapAree() diff --git a/WebWindowComplex/Models/Fill.cs b/WebWindowComplex/Models/Fill.cs index 49d4def..6126005 100644 --- a/WebWindowComplex/Models/Fill.cs +++ b/WebWindowComplex/Models/Fill.cs @@ -64,7 +64,7 @@ namespace WebWindowComplex.Models { Fill newFill = new Fill(newParentArea, m_ParentWindow); AddCounterGroup(); - newFill.SetIdGroup(nCounterGroup); + newFill.SetGroupId(nCounterGroup); newFill.SetFillType(SelFillType); newFill.SetAreaType(AreaType); return newFill; @@ -78,7 +78,7 @@ namespace WebWindowComplex.Models { Fill Fill = new Fill(AreaParent, AreaParent.ParentWindow); AddCounterGroup(); - Fill.SetIdGroup(nCounterGroup); + Fill.SetGroupId(nCounterGroup); Fill.SetAreaType(AreaTypes.FILL); Fill.SetFillType(FillType); return Fill; diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 4d4a4fb..8919117 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -460,7 +460,7 @@ namespace WebWindowComplex.Models { Sash newSash = new Sash(newParentArea, m_ParentWindow); AddCounterGroup(); - newSash.SetIdGroup(nCounterGroup); + newSash.SetGroupId(nCounterGroup); newSash.SetAreaType(AreaType); // Imposta la quantità di ante e definisce SashDimension di ogni anta ai valori di default newSash.SetSashQty(nSashQty); @@ -561,7 +561,7 @@ namespace WebWindowComplex.Models { Sash newSash = new Sash(Area, Area.ParentWindow); AddCounterGroup(); - newSash.SetIdGroup(nCounterGroup); + newSash.SetGroupId(nCounterGroup); newSash.SetAreaType(AreaTypes.SASH); newSash.SetSashQty(1); newSash.SetOrientationSashType(OrientationSash.VERTICAL); diff --git a/WebWindowComplex/Models/Split.cs b/WebWindowComplex/Models/Split.cs index dd96fde..e845b3e 100644 --- a/WebWindowComplex/Models/Split.cs +++ b/WebWindowComplex/Models/Split.cs @@ -316,7 +316,7 @@ namespace WebWindowComplex.Models { Split newSplit = new Split(newParentArea, ParentWindow); AddCounterGroup(); - newSplit.SetIdGroup(nCounterGroup); + newSplit.SetGroupId(nCounterGroup); newSplit.SetSplitStartVert(bSplitStartVert); newSplit.SetSplitQtyVert(nSplitQtyVert); for (int i = 0; i < SplitVertList.Count; i++) @@ -363,7 +363,7 @@ namespace WebWindowComplex.Models { Split Split = new Split(Area, Area.ParentWindow); AddCounterGroup(); - Split.SetIdGroup(nCounterGroup); + Split.SetGroupId(nCounterGroup); Split.SetAreaType(AreaTypes.SPLIT); Split.SetSplitShape(SplitShape, true); return Split; diff --git a/WebWindowComplex/Models/Splitted.cs b/WebWindowComplex/Models/Splitted.cs index 8549716..012c38d 100644 --- a/WebWindowComplex/Models/Splitted.cs +++ b/WebWindowComplex/Models/Splitted.cs @@ -19,7 +19,7 @@ namespace WebWindowComplex.Models { Splitted newSplitted = new Splitted(newParentArea, ParentWindow); AddCounterGroup(); - newSplitted.SetIdGroup(nCounterGroup); + newSplitted.SetGroupId(nCounterGroup); newSplitted.SetAreaType(AreaType); foreach (var item in AreaList) { @@ -37,7 +37,7 @@ namespace WebWindowComplex.Models { Splitted Splitted = new Splitted(ParentArea, ParentArea.ParentWindow); AddCounterGroup(); - Splitted.SetIdGroup(nCounterGroup); + Splitted.SetGroupId(nCounterGroup); Splitted.SetAreaType(AreaTypes.SPLITTED); return Splitted; } diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index 03f83b0..a3bb4df 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -54,6 +54,8 @@ + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 97cee3d..18a7ee5 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -142,6 +142,8 @@ + +