From dfe4ecd9d15a0480bc2628b841a4d20153fb0274 Mon Sep 17 00:00:00 2001 From: Annamaria Sassi Date: Tue, 2 Dec 2025 16:44:01 +0100 Subject: [PATCH] Aggiunto arc element per Frame e Sash (da rivedere) --- Test.UI/Components/Pages/EditJWD.razor.cs | 3 +- Test.UI/Data/ArcoAntaDoppia.jwd | 150 ++++++++++++++++++ Test.UI/Test.UI.csproj | 3 + WebWindowComplex/Compo/AreaFrameArcElem.razor | 66 ++++++++ .../Compo/AreaFrameArcElem.razor.cs | 81 ++++++++++ WebWindowComplex/Compo/AreaSash.razor | 39 ++--- WebWindowComplex/Compo/AreaSash.razor.cs | 2 +- WebWindowComplex/Compo/AreaSashArcElem.razor | 58 +++++++ .../Compo/AreaSashArcElem.razor.cs | 75 +++++++++ WebWindowComplex/Compo/CardArcElement.razor | 27 ++++ .../Compo/CardArcElement.razor.cs | 60 +++++++ WebWindowComplex/Compo/CardSashGroup.razor | 2 +- WebWindowComplex/Compo/CardSplit.razor | 2 +- WebWindowComplex/Json/JsonUtility.cs | 147 +++++++++++++++-- WebWindowComplex/Json/WindowConst.cs | 2 +- WebWindowComplex/LayoutConst.cs | 3 +- WebWindowComplex/Models/Area.cs | 9 +- WebWindowComplex/Models/Frame.cs | 65 +++++++- WebWindowComplex/Models/FrameArcElement.cs | 121 ++++++++++++++ WebWindowComplex/Models/FrameDimension.cs | 4 +- WebWindowComplex/Models/Sash.cs | 36 ++++- WebWindowComplex/Models/SashArcElement.cs | 96 +++++++++++ WebWindowComplex/Models/SashDimension.cs | 27 ++-- WebWindowComplex/Models/SplitDimension.cs | 26 +-- WebWindowComplex/TableComp.razor | 17 ++ WebWindowComplex/TableComp.razor.cs | 2 + WebWindowComplex/WebWindowComplex.csproj | 10 +- .../WebWindowConfigurator.csproj | 20 ++- 28 files changed, 1075 insertions(+), 78 deletions(-) create mode 100644 Test.UI/Data/ArcoAntaDoppia.jwd create mode 100644 WebWindowComplex/Compo/AreaFrameArcElem.razor create mode 100644 WebWindowComplex/Compo/AreaFrameArcElem.razor.cs create mode 100644 WebWindowComplex/Compo/AreaSashArcElem.razor create mode 100644 WebWindowComplex/Compo/AreaSashArcElem.razor.cs create mode 100644 WebWindowComplex/Compo/CardArcElement.razor create mode 100644 WebWindowComplex/Compo/CardArcElement.razor.cs create mode 100644 WebWindowComplex/Models/FrameArcElement.cs create mode 100644 WebWindowComplex/Models/SashArcElement.cs diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs index 3e41df8..50f69ca 100644 --- a/Test.UI/Components/Pages/EditJWD.razor.cs +++ b/Test.UI/Components/Pages/EditJWD.razor.cs @@ -127,7 +127,8 @@ namespace Test.UI.Components.Pages { ConfInit(); //InitialJwd = File.ReadAllText("Data\\FinestraSplitVert.jwd"); - InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd"); + //InitialJwd = File.ReadAllText("Data\\AntaDoppia.jwd"); + InitialJwd = File.ReadAllText("Data\\ArcoAntaDoppia.jwd"); currJwd = InitialJwd; // rileggo altri dati await ReloadData(); diff --git a/Test.UI/Data/ArcoAntaDoppia.jwd b/Test.UI/Data/ArcoAntaDoppia.jwd new file mode 100644 index 0000000..b9032e7 --- /dev/null +++ b/Test.UI/Data/ArcoAntaDoppia.jwd @@ -0,0 +1,150 @@ +{ + "ProfilePath": "Profilo78", + "Material": "Pino", + "ColorMaterial": "Black", + "Glass": "Vetro BE 2S 4T/16/4T", + "AreaList": [ + { + "Shape": "ARC", + "DimensionList": [ + { + "Index": 1, + "Name": "Width", + "Value": 800.0 + }, + { + "Index": 2, + "Name": "Height", + "Value": 1500.0 + }, + { + "Index": 3, + "Name": "Full Height", + "Value": 1800.0 + } + ], + "JointList": [ + { + "Index": 1, + "JointType": "FULL_H" + }, + { + "Index": 2, + "JointType": "FULL_H" + }, + { + "Index": 3, + "JointType": "FULL_V" + }, + { + "Index": 4, + "JointType": "FULL_V" + } + ], + "BottomRail": false, + "BottomRailQty": 0, + "ArcElement": { + "Section": 10.0, + "CutEdge": true, + "IsAlign": true + }, + "GroupId": 1, + "AreaList": [ + { + "IsSashVertical": true, + "ArcElement": { + "Section": 10.0, + "CutEdge": true, + "IsAlign": true + }, + "SashList": [ + { + "SashId": 1, + "OpeningType": "TILTTURN_LEFT", + "MeasureType": "PERCENTAGE", + "Dimension": 50.0, + "HasHandle": true, + "JointList": [ + { + "Index": 1, + "JointType": "FULL_V" + }, + { + "Index": 2, + "JointType": "FULL_V" + }, + { + "Index": 3, + "JointType": "FULL_V" + }, + { + "Index": 4, + "JointType": "FULL_V" + } + ] + }, + { + "SashId": 2, + "OpeningType": "TURNONLY_RIGHT", + "MeasureType": "PERCENTAGE", + "Dimension": 50.0, + "HasHandle": false, + "JointList": [ + { + "Index": 1, + "JointType": "FULL_V" + }, + { + "Index": 2, + "JointType": "FULL_V" + }, + { + "Index": 3, + "JointType": "FULL_V" + }, + { + "Index": 4, + "JointType": "FULL_V" + } + ] + } + ], + "SashType": "NULL", + "BottomRail": false, + "BottomRailQty": 0, + "Hardware": "000644", + "HwOptionList": [], + "GroupId": 2, + "AreaList": [ + { + "GroupId": 4, + "AreaList": [ + { + "FillType": "GLASS", + "GroupId": 3, + "AreaList": [], + "AreaType": "FILL" + } + ], + "AreaType": "SPLITTED" + }, + { + "GroupId": 5, + "AreaList": [ + { + "FillType": "GLASS", + "GroupId": 6, + "AreaList": [], + "AreaType": "FILL" + } + ], + "AreaType": "SPLITTED" + } + ], + "AreaType": "SASH" + } + ], + "AreaType": "FRAME" + } + ] +} \ No newline at end of file diff --git a/Test.UI/Test.UI.csproj b/Test.UI/Test.UI.csproj index 8cf883b..75050e1 100644 --- a/Test.UI/Test.UI.csproj +++ b/Test.UI/Test.UI.csproj @@ -43,6 +43,9 @@ + + Always + Always diff --git a/WebWindowComplex/Compo/AreaFrameArcElem.razor b/WebWindowComplex/Compo/AreaFrameArcElem.razor new file mode 100644 index 0000000..0cdc13c --- /dev/null +++ b/WebWindowComplex/Compo/AreaFrameArcElem.razor @@ -0,0 +1,66 @@ + +
+
+
Frame
+
+
+
+
+
+
+
+ +
+
+
+ Qty element + @if (insertQty) + { + + } + else + { + + } +
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+ Section + @if (!insertQty) + { + + } + else + { + + } +
+
+
+
+
+ +
+
+ +
+
+
+
+
diff --git a/WebWindowComplex/Compo/AreaFrameArcElem.razor.cs b/WebWindowComplex/Compo/AreaFrameArcElem.razor.cs new file mode 100644 index 0000000..5cc8d19 --- /dev/null +++ b/WebWindowComplex/Compo/AreaFrameArcElem.razor.cs @@ -0,0 +1,81 @@ +using Microsoft.AspNetCore.Components; +using System.Runtime.CompilerServices; +using WebWindowComplex.DTO; +using WebWindowComplex.Models; + +namespace WebWindowComplex.Compo +{ + public partial class AreaFrameArcElem + { + #region Public Properties + + [Parameter] + public Frame CurrFrame { get; set; } = null!; + + [Parameter] + public EventCallback EC_UpdatePreview { get; set; } + + #endregion Public Properties + + #region Protected Properties + + protected int ArcElementQty + { + get => CurrFrame.FrameArcElem.nQty; + set + { + CurrFrame.FrameArcElem.nQty = value; + _ = EC_UpdatePreview.InvokeAsync(CurrFrame); + } + } + + protected double ArcSection + { + get => CurrFrame.FrameArcElem.nSection; + set + { + CurrFrame.FrameArcElem.nSection = value; + _ = EC_UpdatePreview.InvokeAsync(CurrFrame); + } + } + + #endregion Protected Properties + + #region Protected Methods + + protected void IsCheckedQty() + { + insertQty = !insertQty; + } + + protected void IsCheckCutEdge() + { + CurrFrame.FrameArcElem.bCutEdge = !CurrFrame.FrameArcElem.bCutEdge; + _ = EC_UpdatePreview.InvokeAsync(CurrFrame); + } + + protected void IsCheckAlign() + { + CurrFrame.FrameArcElem.bIsAlign = !CurrFrame.FrameArcElem.bIsAlign; + _ = EC_UpdatePreview.InvokeAsync(CurrFrame); + } + + protected string IsUsedQty() + { + if (insertQty) + return "form-control"; + else + return "form-control disabled"; + } + + + #endregion Protected Methods + + #region Private Fields + + private bool insertQty = false; + + #endregion Private Fields + } + +} \ No newline at end of file diff --git a/WebWindowComplex/Compo/AreaSash.razor b/WebWindowComplex/Compo/AreaSash.razor index 5e91ec6..3ddd227 100644 --- a/WebWindowComplex/Compo/AreaSash.razor +++ b/WebWindowComplex/Compo/AreaSash.razor @@ -4,26 +4,29 @@
Sash @(CurrSashGroup.SashList.Count == 1 ? "" : (IndexSash + 1))
-
- -
    - @for (int k = 0; k <= CurrSashGroup.SashList.Count - 1; k++) - { - @if (k != IndexSash) + @if(CurrSashGroup.SashList.Count > 1) + { +
    + +
      + @for (int k = 0; k <= CurrSashGroup.SashList.Count - 1; k++) { - int IndexCopy = k; - int IndexModify = IndexSash; -
    • - -
      • + @if (k != IndexSash) + { + int IndexCopy = k; + int IndexModify = IndexSash; +
    • + +
      • + } } - } -
    -
    +
+
+ }
diff --git a/WebWindowComplex/Compo/AreaSash.razor.cs b/WebWindowComplex/Compo/AreaSash.razor.cs index c62b8bf..c3cff0e 100644 --- a/WebWindowComplex/Compo/AreaSash.razor.cs +++ b/WebWindowComplex/Compo/AreaSash.razor.cs @@ -84,7 +84,7 @@ namespace WebWindowComplex.Compo { switch (CurrSashDim.MeasureType) { - case Json.WindowConst.MeasureTypes.ABSOLUT: + case Json.WindowConst.MeasureTypes.ABSOLUTE: { return 2; } diff --git a/WebWindowComplex/Compo/AreaSashArcElem.razor b/WebWindowComplex/Compo/AreaSashArcElem.razor new file mode 100644 index 0000000..b68d1f9 --- /dev/null +++ b/WebWindowComplex/Compo/AreaSashArcElem.razor @@ -0,0 +1,58 @@ + +
+
+
Sash
+
+
+
+
+
+
+
+ +
+
+
+ Qty element + @if (insertQty) + { + + } + else + { + + } +
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+ Section + @if (!insertQty) + { + + } + else + { + + } +
+
+
+
+
+
diff --git a/WebWindowComplex/Compo/AreaSashArcElem.razor.cs b/WebWindowComplex/Compo/AreaSashArcElem.razor.cs new file mode 100644 index 0000000..eff80f7 --- /dev/null +++ b/WebWindowComplex/Compo/AreaSashArcElem.razor.cs @@ -0,0 +1,75 @@ +using Microsoft.AspNetCore.Components; +using System.Runtime.CompilerServices; +using WebWindowComplex.DTO; +using WebWindowComplex.Models; + +namespace WebWindowComplex.Compo +{ + public partial class AreaSashArcElem + { + #region Public Properties + + [Parameter] + public Sash CurrSashGroup { get; set; } = null!; + + [Parameter] + public EventCallback EC_UpdatePreview { get; set; } + + #endregion Public Properties + + #region Protected Properties + + protected int ArcElementQty + { + get => CurrSashGroup.SashArcElem.nQty; + set + { + CurrSashGroup.SashArcElem.nQty = value; + _ = EC_UpdatePreview.InvokeAsync(CurrSashGroup); + } + } + + protected double ArcSection + { + get => CurrSashGroup.SashArcElem.nSection; + set + { + CurrSashGroup.SashArcElem.nSection = value; + _ = EC_UpdatePreview.InvokeAsync(CurrSashGroup); + } + } + + #endregion Protected Properties + + #region Protected Methods + + protected void IsCheckedQty() + { + insertQty = !insertQty; + } + + protected void IsCheckCutEdge() + { + CurrSashGroup.SashArcElem.bCutEdge = !CurrSashGroup.SashArcElem.bCutEdge; + _ = EC_UpdatePreview.InvokeAsync(CurrSashGroup); + } + + protected string IsUsedQty() + { + if (insertQty) + return "form-control"; + else + return "form-control disabled"; + } + + + #endregion Protected Methods + + #region Private Fields + + private bool insertQty = false; + + #endregion Private Fields + } + +} \ No newline at end of file diff --git a/WebWindowComplex/Compo/CardArcElement.razor b/WebWindowComplex/Compo/CardArcElement.razor new file mode 100644 index 0000000..e29174e --- /dev/null +++ b/WebWindowComplex/Compo/CardArcElement.razor @@ -0,0 +1,27 @@ +
+
+
+
+
Arc Element
+
+
+ +
+
+
+
+
+ + + + @foreach (var sashGroup in SashList) + { +
+ + + } +
+
+
\ No newline at end of file diff --git a/WebWindowComplex/Compo/CardArcElement.razor.cs b/WebWindowComplex/Compo/CardArcElement.razor.cs new file mode 100644 index 0000000..19bc564 --- /dev/null +++ b/WebWindowComplex/Compo/CardArcElement.razor.cs @@ -0,0 +1,60 @@ +using Microsoft.AspNetCore.Components; +using WebWindowComplex.DTO; +using WebWindowComplex.Models; + +namespace WebWindowComplex.Compo +{ + public partial class CardArcElement + { + #region Public Properties + + /// + /// Finestra corrente + /// + [Parameter] + public Frame CurrFrame { get; set; } = null!; + + /// + /// Lista sash group + /// + [Parameter] + public List SashList { get; set; } = null!; + + [Parameter] + public EventCallback EC_UpdatePreview { get; set; } + + [Parameter] + public EventCallback EC_ReqClose { get; set; } + + #endregion Public Properties + + private async Task UpdatePreview() + { + var args = new DataUpdateFrame + { + currFrame = CurrFrame + }; + await EC_UpdatePreview.InvokeAsync(args); + } + + private async Task UpdatePreviewSash(Sash CurrSashGRoup) + { + var currRec = SashList.First(x => x.GroupId == CurrSashGRoup.GroupId); + if (currRec != null) + { + currRec = CurrSashGRoup; + var args = new DataUpdateFrame + { + currFrame = CurrFrame + }; + await EC_UpdatePreview.InvokeAsync(args); + } + } + + private void ReqClose() + { + _ = EC_ReqClose.InvokeAsync(true); + } + } + +} \ No newline at end of file diff --git a/WebWindowComplex/Compo/CardSashGroup.razor b/WebWindowComplex/Compo/CardSashGroup.razor index 33f4aa2..9689706 100644 --- a/WebWindowComplex/Compo/CardSashGroup.razor +++ b/WebWindowComplex/Compo/CardSashGroup.razor @@ -110,7 +110,7 @@
  • -
    • diff --git a/WebWindowComplex/Compo/CardSplit.razor b/WebWindowComplex/Compo/CardSplit.razor index 883cae9..bffee85 100644 --- a/WebWindowComplex/Compo/CardSplit.razor +++ b/WebWindowComplex/Compo/CardSplit.razor @@ -29,7 +29,7 @@
    • -
      • diff --git a/WebWindowComplex/Json/JsonUtility.cs b/WebWindowComplex/Json/JsonUtility.cs index 11df650..2abc249 100644 --- a/WebWindowComplex/Json/JsonUtility.cs +++ b/WebWindowComplex/Json/JsonUtility.cs @@ -229,6 +229,20 @@ namespace WebWindowComplex.Json } } + private JsonFrameArcElement m_FrameArcElem; + [JsonProperty] + public JsonFrameArcElement ArcElement + { + get + { + return m_FrameArcElem; + } + set + { + m_FrameArcElem = value; + } + } + public JsonFrame() : base(AreaTypes.FRAME) { } @@ -249,6 +263,8 @@ namespace WebWindowComplex.Json newFrame.SetSelShape(m_Shape); newFrame.SetBottomRail(m_bBottomRail); newFrame.SetBottomRailQty(m_nBottomRailQty); + if(ArcElement != null) + newFrame.SetFrameArcElem(ArcElement.Deserialize(newFrame, ParentWindow)); //Frame.AppliedDone(); for (var DimensionIndex = 0; DimensionIndex <= m_DimensionList.Count - 1; DimensionIndex++) newFrame.DimensionList[DimensionIndex].SetDimension(m_DimensionList[DimensionIndex].Value); @@ -311,20 +327,6 @@ namespace WebWindowComplex.Json } } - //private List m_JointList = new List(); - //[JsonProperty] - //public List JointList - //{ - // get - // { - // return m_JointList; - // } - // set - // { - // m_JointList = value; - // } - //} - private bool m_bBottomRail; [JsonProperty] public bool BottomRail @@ -353,6 +355,20 @@ namespace WebWindowComplex.Json } } + private JsonSashArcElement m_SashArcElem; + [JsonProperty] + public JsonSashArcElement ArcElement + { + get + { + return m_SashArcElem; + } + set + { + m_SashArcElem = value; + } + } + private string m_Hardware; [JsonProperty] public string Hardware @@ -418,6 +434,8 @@ namespace WebWindowComplex.Json newSash.SetSelHardwareFromId(Hardware); foreach (var HwOption in m_HwOptionList) newSash.SelHwOptionList.Add(HwOption.Name, HwOption.Value); + if (ArcElement != null) + newSash.SetSashArcElem(ArcElement.Deserialize(newSash, ParentWindow)); foreach (var Area in AreaList) { var AreaDeserealized = Area.Deserialize(newSash, ParentWindow); @@ -617,6 +635,107 @@ namespace WebWindowComplex.Json } } + public class JsonFrameArcElement + { + private double m_Section; + [JsonProperty] + public double Section + { + get + { + return m_Section; + } + set + { + m_Section = value; + } + } + + private bool m_bCutEdge; + [JsonProperty] + public bool CutEdge + { + get + { + return m_bCutEdge; + } + set + { + m_bCutEdge = value; + } + } + + private bool m_bIsAlign; + [JsonProperty] + public bool IsAlign + { + get + { + return m_bIsAlign; + } + set + { + m_bIsAlign = value; + } + } + + public JsonFrameArcElement(double Section, bool CutEdge, bool IsAlign) + { + m_Section = Section; + m_bCutEdge = CutEdge; + m_bIsAlign = IsAlign; + } + + internal FrameArcElement Deserialize(Area ParentArea, Window ParentWindow) + { + FrameArcElement arcElement = new FrameArcElement(ParentArea, ParentWindow, m_Section, m_bCutEdge, m_bIsAlign); + return arcElement; + } + } + + public class JsonSashArcElement + { + private double m_Section; + [JsonProperty] + public double Section + { + get + { + return m_Section; + } + set + { + m_Section = value; + } + } + + private bool m_bCutEdge; + [JsonProperty] + public bool CutEdge + { + get + { + return m_bCutEdge; + } + set + { + m_bCutEdge = value; + } + } + + public JsonSashArcElement(double Section, bool CutEdge) + { + m_Section = Section; + m_bCutEdge = CutEdge; + } + + internal SashArcElement Deserialize(Area ParentArea, Window ParentWindow) + { + SashArcElement arcElement = new SashArcElement(ParentArea, ParentWindow, m_Section, m_bCutEdge); + return arcElement; + } + } + public class JsonJoint { private int m_nIndex; diff --git a/WebWindowComplex/Json/WindowConst.cs b/WebWindowComplex/Json/WindowConst.cs index 34a7e29..e691ed2 100644 --- a/WebWindowComplex/Json/WindowConst.cs +++ b/WebWindowComplex/Json/WindowConst.cs @@ -121,7 +121,7 @@ namespace WebWindowComplex.Json public enum MeasureTypes: int { NULL = 0, - ABSOLUT = 1, + ABSOLUTE = 1, PROPORTIONAL = 2, PERCENTAGE = 3 } diff --git a/WebWindowComplex/LayoutConst.cs b/WebWindowComplex/LayoutConst.cs index 28b2951..5b01e63 100644 --- a/WebWindowComplex/LayoutConst.cs +++ b/WebWindowComplex/LayoutConst.cs @@ -15,7 +15,8 @@ namespace WebWindowComplex Split, Sash, Fill, - General + General, + ArcElement } public enum PositionJoints diff --git a/WebWindowComplex/Models/Area.cs b/WebWindowComplex/Models/Area.cs index 6c9fbb1..d144c25 100644 --- a/WebWindowComplex/Models/Area.cs +++ b/WebWindowComplex/Models/Area.cs @@ -108,8 +108,15 @@ namespace WebWindowComplex.Models SashArea.SetSelFamilyHardware(""); // Inserisco hardware di default SashArea.SetSelHardwareFromId("000000"); + if (ParentWindow.AreaList.First().SelShapeIndex == (int)Shapes.ARC || + ParentWindow.AreaList.First().SelShapeIndex == (int)Shapes.DOUBLEARC || + ParentWindow.AreaList.First().SelShapeIndex == (int)Shapes.ARC_FULL || + ParentWindow.AreaList.First().SelShapeIndex == (int)Shapes.THREECENTERARC) + SashArea.SashArcElem = new SashArcElement(SashArea, ParentWindow, 10, true); + else + SashArea.SashArcElem = null; // Salvo gli oggetti già presenti e li cancello da AreaList - List ContentArea = new List(); + List ContentArea = new List(); ContentArea.Add(AreaList[0]); AreaList.Remove(AreaList[0]); // Aggiungo area diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs index 72d4a03..f4f66af 100644 --- a/WebWindowComplex/Models/Frame.cs +++ b/WebWindowComplex/Models/Frame.cs @@ -20,6 +20,18 @@ namespace WebWindowComplex.Models #region Public Properties + public FrameArcElement? FrameArcElem + { + get + { + return m_FrameArcElem; + } + set + { + m_FrameArcElem = value!; + } + } + public bool BottomRail { get @@ -207,11 +219,40 @@ namespace WebWindowComplex.Models break; } } + switch (SelShape) + { + case Shapes.RECTANGLE: + case Shapes.RIGHTCHAMFER: + case Shapes.LEFTCHAMFER: + case Shapes.DOUBLECHAMFER: + case Shapes.TRIANGLE: + { + FrameArcElem = null; + SearchSash(this); + break; + } + } m_Shape = SelShape; } } } + protected void SearchSash(Area node) + { + if (node != null) + { + if (node.AreaType.Equals(AreaTypes.SASH)) + { + Sash s = (Sash)node; + s.SashArcElem = null; + } + foreach (var item in node.AreaList) + { + SearchSash(item); + } + } + } + public Shapes Shape { get @@ -241,14 +282,20 @@ namespace WebWindowComplex.Models #region Internal Methods + internal void SetFrameArcElem(FrameArcElement arcElement) + { + m_FrameArcElem = arcElement; + } + internal static Area CreateFrame(Window Window) { - Frame NewFrame = new Frame(null, Window); - NewFrame.SetAreaType(AreaTypes.FRAME); - NewFrame.SetSelShape(Shapes.RECTANGLE); - NewFrame.SetBottomRail(false); - NewFrame.SetBottomRailQty(0); - return NewFrame; + Frame newFrame = new Frame(null, Window); + newFrame.SetAreaType(AreaTypes.FRAME); + newFrame.SetSelShape(Shapes.RECTANGLE); + newFrame.SetBottomRail(false); + newFrame.SetBottomRailQty(0); + newFrame.FrameArcElem = null; + return newFrame; } internal override JsonArea Serialize(bool hideHw) @@ -257,6 +304,10 @@ namespace WebWindowComplex.Models if (nCounterGroup < GroupId) Area.nCounterGroup = GroupId; JsonFrame JsonFrame = new JsonFrame(m_Shape, m_bBottomRail, m_nBottomRailQty, GroupId); + if (FrameArcElem != null) + JsonFrame.ArcElement = FrameArcElem.Serialize(); + else + JsonFrame.ArcElement = null; foreach (var Dimension in DimensionList) JsonFrame.DimensionList.Add(Dimension.Serialize()); foreach (var Joint in JointList) @@ -395,6 +446,8 @@ namespace WebWindowComplex.Models #region Private Fields + private FrameArcElement m_FrameArcElem = new FrameArcElement(); + private bool m_bBottomRail; private List m_DimensionList = new List(); diff --git a/WebWindowComplex/Models/FrameArcElement.cs b/WebWindowComplex/Models/FrameArcElement.cs new file mode 100644 index 0000000..26fd076 --- /dev/null +++ b/WebWindowComplex/Models/FrameArcElement.cs @@ -0,0 +1,121 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using WebWindowComplex.Json; +using static WebWindowComplex.Json.WindowConst; + +namespace WebWindowComplex.Models +{ + public class FrameArcElement + { + #region Public Constructors + + public FrameArcElement() { } + + public FrameArcElement(Area ParentArea, Window ParentWindow, double nSection, bool bCutEdge, bool bIsAlign) + { + m_ParentArea = ParentArea; + m_ParentWindow = ParentWindow; + m_nSection = nSection; + m_bCutEdge = bCutEdge; + m_bIsAlign = bIsAlign; + } + + #endregion Public Constructors + + #region Public Properties + + public int nQty + { + get + { + return m_nQty; + } + set + { + m_nQty = value; + } + } + + public double nSection + { + get + { + return m_nSection; + } + set + { + m_nSection = value; + } + } + + public bool bCutEdge + { + get + { + return m_bCutEdge; + } + set + { + m_bCutEdge = value; + } + } + + public bool bIsAlign + { + get + { + return m_bIsAlign; + } + set + { + m_bIsAlign = value; + } + } + + #endregion Public Properties + + #region Internal Methods + + internal void SetQty(int Qty) + { + m_nQty = Qty; + } + + internal void SetSection(double Section) + { + m_nSection = Section; + } + + internal JsonFrameArcElement Serialize() + { + JsonFrameArcElement jArcElement = new JsonFrameArcElement(nSection, bCutEdge, bIsAlign); + return jArcElement; + } + + #endregion Internal Methods + + #region Protected Fields + + protected Area m_ParentArea; + protected Window m_ParentWindow; + + #endregion Protected Fields + + #region Private Fields + + private double m_nSection; + + private int m_nQty; + + private bool m_bCutEdge = false; + + private bool m_bIsAlign = false; + + #endregion Private Fields + } +} \ No newline at end of file diff --git a/WebWindowComplex/Models/FrameDimension.cs b/WebWindowComplex/Models/FrameDimension.cs index bf08b2a..2d5dae9 100644 --- a/WebWindowComplex/Models/FrameDimension.cs +++ b/WebWindowComplex/Models/FrameDimension.cs @@ -102,7 +102,7 @@ namespace WebWindowComplex.Models if(area is Sash && sName.Equals("Width")) { Sash sash = (Sash)area; - int countAbsolute = sash.SashList.Where(x => x.MeasureType.Equals(MeasureTypes.ABSOLUT)).Count(); + int countAbsolute = sash.SashList.Where(x => x.MeasureType.Equals(MeasureTypes.ABSOLUTE)).Count(); if (countAbsolute == sash.SashList.Count) { double sum = sash.SashList.Sum(x => x.dDimension); @@ -132,7 +132,7 @@ namespace WebWindowComplex.Models splitList = split.SplitVertList; else splitList = split.SplitHorizList; - int countAbsolute = splitList.Where(x => x.MeasureType.Equals(MeasureTypes.ABSOLUT)).Count(); + int countAbsolute = splitList.Where(x => x.MeasureType.Equals(MeasureTypes.ABSOLUTE)).Count(); if (countAbsolute != 0 && countAbsolute == splitList.Count) { double sum = splitList.Sum(x => x.dDimension); diff --git a/WebWindowComplex/Models/Sash.cs b/WebWindowComplex/Models/Sash.cs index 401565b..7e779a9 100644 --- a/WebWindowComplex/Models/Sash.cs +++ b/WebWindowComplex/Models/Sash.cs @@ -58,6 +58,18 @@ namespace WebWindowComplex.Models } } + public SashArcElement? SashArcElem + { + get + { + return m_SashArcElement; + } + set + { + m_SashArcElement = value!; + } + } + public List HardwareList { get @@ -409,6 +421,13 @@ namespace WebWindowComplex.Models } newSash.SetSelFamilyHardwareFromIndex(m_SelHardware.Id); newSash.SetSelHardwareFromId(CustomHwId); + if (ParentWindow.AreaList.First().SelShapeIndex == (int)Shapes.ARC || + ParentWindow.AreaList.First().SelShapeIndex == (int)Shapes.DOUBLEARC || + ParentWindow.AreaList.First().SelShapeIndex == (int)Shapes.ARC_FULL || + ParentWindow.AreaList.First().SelShapeIndex == (int)Shapes.THREECENTERARC) + newSash.SashArcElem = new SashArcElement(newSash, ParentWindow, 10, true); + else + newSash.SashArcElem = null; return newSash; } @@ -552,7 +571,7 @@ namespace WebWindowComplex.Models { switch (split.SplitVertList.ElementAt(i).SelMeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { risultato = CalculateWidthSashGroup(item, split.SplitVertList.ElementAt(i).dDimension); break; @@ -581,7 +600,7 @@ namespace WebWindowComplex.Models Sash sash = (Sash)area; switch (sash.SashList.ElementAt(i).SelMeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { risultato = CalculateWidthSashGroup(item, sash.SashList.ElementAt(i).dDimension); break; @@ -621,13 +640,14 @@ namespace WebWindowComplex.Models foreach(var sashDim in newSash.SashList) { for (var JointIndex = 0; JointIndex <= 3; JointIndex++) - sashDim.JointList.Add(new Joint(newSash, JointIndex + 1, Joints.FULL_H)); + sashDim.JointList.Add(new Joint(newSash, JointIndex + 1, Joints.FULL_V)); } newSash.SetSashBottomRail(false); newSash.SetSashBottomRailQty(0); newSash.SetSelFamilyHardware(Sash.s_FamilyHardwareList.First()); newSash.ClearHardwareOptionList(); newSash.SetFirstHardware(); + newSash.SashArcElem = null; return newSash; } @@ -734,11 +754,20 @@ namespace WebWindowComplex.Models foreach (var HwOption in SelHwOptionList) JsonSash.HwOptionList.Add(new JsonHwOption(HwOption.Key, HwOption.Value)); } + if (SashArcElem != null) + JsonSash.ArcElement = SashArcElem.Serialize(); + else + JsonSash.ArcElement = null; foreach (var Area in AreaList) JsonSash.AreaList.Add(Area.Serialize(hideHw)); return JsonSash; } + internal void SetSashArcElem(SashArcElement arcElement) + { + m_SashArcElement = arcElement; + } + internal void SetFirstHardware() { if (m_HardwareList.Count > 0) @@ -949,6 +978,7 @@ namespace WebWindowComplex.Models private string m_SelFamilyHardware = ""; private Hardware m_SelHardware; private OrientationSash m_SelOrientationSashType; + private SashArcElement m_SashArcElement; #endregion Private Fields diff --git a/WebWindowComplex/Models/SashArcElement.cs b/WebWindowComplex/Models/SashArcElement.cs new file mode 100644 index 0000000..d942482 --- /dev/null +++ b/WebWindowComplex/Models/SashArcElement.cs @@ -0,0 +1,96 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using WebWindowComplex.Json; +using static WebWindowComplex.Json.WindowConst; + +namespace WebWindowComplex.Models +{ + public class SashArcElement + { + #region Public Constructors + + public SashArcElement() { } + + public SashArcElement(Area ParentArea, Window ParentWindow, double nSection, bool bCutEdge) + { + m_ParentArea = ParentArea; + m_ParentWindow = ParentWindow; + m_nSection = nSection; + m_bCutEdge = bCutEdge; + } + + #endregion Public Constructors + + #region Public Properties + + public int nQty + { + get + { + return m_nQty; + } + set + { + m_nQty = value; + } + } + + public double nSection + { + get + { + return m_nSection; + } + set + { + m_nSection = value; + } + } + + public bool bCutEdge + { + get + { + return m_bCutEdge; + } + set + { + m_bCutEdge = value; + } + } + + #endregion Public Properties + + #region Internal Methods + + internal JsonSashArcElement Serialize() + { + JsonSashArcElement jArcElement = new JsonSashArcElement(nSection, bCutEdge); + return jArcElement; + } + + #endregion Internal Methods + + #region Protected Fields + + protected Area m_ParentArea; + protected Window m_ParentWindow; + + #endregion Protected Fields + + #region Private Fields + + private double m_nSection; + + private int m_nQty; + + private bool m_bCutEdge = false; + + #endregion Private Fields + } +} \ No newline at end of file diff --git a/WebWindowComplex/Models/SashDimension.cs b/WebWindowComplex/Models/SashDimension.cs index 72cdea9..7f9c35a 100644 --- a/WebWindowComplex/Models/SashDimension.cs +++ b/WebWindowComplex/Models/SashDimension.cs @@ -132,7 +132,7 @@ namespace WebWindowComplex.Models bool valueAccept = false; switch (MeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { valueAccept = (value < valMaxAbsolut && value > valMinAbsolut) ? true : false; break; @@ -140,7 +140,7 @@ namespace WebWindowComplex.Models case MeasureTypes.PROPORTIONAL: { valMaxAbsolut = 20; - valueAccept = (value > 1) ? true : false; + valueAccept = (value >= 1) ? true : false; break; } case MeasureTypes.PERCENTAGE: @@ -163,7 +163,8 @@ namespace WebWindowComplex.Models int proportionalCount = dimensions.Where(x => x.MeasureType.Equals(MeasureTypes.PROPORTIONAL)).ToList().Count; int percentageCount = dimensions.Where(x => x.MeasureType.Equals(MeasureTypes.PERCENTAGE)).ToList().Count; // Le dimensioni sono solo in proporzionale - if (proportionalCount == absolutValList.Count) + if (proportionalCount == absolutValList.Count || SelMeasureType.Equals(MeasureTypes.PROPORTIONAL) || + (SelMeasureType.Equals(MeasureTypes.ABSOLUTE) && proportionalCount == absolutValList.Count -1)) { m_dDimension = value; } @@ -220,7 +221,7 @@ namespace WebWindowComplex.Models double valueInAbsolute = 0; switch (MeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { valueInAbsolute = value; break; @@ -399,7 +400,7 @@ namespace WebWindowComplex.Models { switch (oldType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { if (newType.Equals(MeasureTypes.PERCENTAGE)) { @@ -413,7 +414,7 @@ namespace WebWindowComplex.Models } case MeasureTypes.PROPORTIONAL: { - if (newType.Equals(MeasureTypes.ABSOLUT)) + if (newType.Equals(MeasureTypes.ABSOLUTE)) { //return Double.Round(ConvertFromPropVal(newType), 2); return ConvertFromPropVal(newType, widthTot); @@ -426,7 +427,7 @@ namespace WebWindowComplex.Models } case MeasureTypes.PERCENTAGE: { - if (newType.Equals(MeasureTypes.ABSOLUT)) + if (newType.Equals(MeasureTypes.ABSOLUTE)) { //return Double.Round((m_dDimension * m_Parent.Width) / 100, 2); return (m_dDimension * widthTot) / 100; @@ -483,7 +484,7 @@ namespace WebWindowComplex.Models { switch (split.SplitVertList.ElementAt(i).SelMeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { risultato = CalculateWidthSashGroup(item, split.SplitVertList.ElementAt(i).dDimension); break; @@ -512,7 +513,7 @@ namespace WebWindowComplex.Models Sash sash = (Sash)area; switch (sash.SashList.ElementAt(i).SelMeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { risultato = CalculateWidthSashGroup(item, sash.SashList.ElementAt(i).dDimension); break; @@ -611,7 +612,7 @@ namespace WebWindowComplex.Models { switch (MeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { //return Double.Round(dDimension, 2); return dDimension; @@ -641,7 +642,7 @@ namespace WebWindowComplex.Models { switch (type) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { //return Double.Round(absolutVal, 2); return absolutVal; @@ -682,7 +683,7 @@ namespace WebWindowComplex.Models double sumPesi = proportionalList.Sum(p => p.dDimension); if (sumPesi == 0) sumPesi = 1; - if (newType.Equals(MeasureTypes.ABSOLUT)) + if (newType.Equals(MeasureTypes.ABSOLUTE)) { return res / sumPesi * dDimension; } @@ -795,7 +796,7 @@ namespace WebWindowComplex.Models private List m_MeasureTypeList = new List { - new IdNameStruct((int)MeasureTypes.ABSOLUT, "Absolut"), + new IdNameStruct((int)MeasureTypes.ABSOLUTE, "Absolut"), new IdNameStruct((int)MeasureTypes.PROPORTIONAL, "Proportional"), new IdNameStruct((int)MeasureTypes.PERCENTAGE, "Percentage"), }; diff --git a/WebWindowComplex/Models/SplitDimension.cs b/WebWindowComplex/Models/SplitDimension.cs index bb103a0..8595322 100644 --- a/WebWindowComplex/Models/SplitDimension.cs +++ b/WebWindowComplex/Models/SplitDimension.cs @@ -60,7 +60,7 @@ namespace WebWindowComplex.Models bool valueAccept = false; switch (MeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { valueAccept = (value < valMaxAbsolut && value > valMinAbsolut) ? true : false; break; @@ -147,7 +147,7 @@ namespace WebWindowComplex.Models double valueInAbsolute = 0; switch (MeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { valueInAbsolute = value; break; @@ -367,7 +367,7 @@ namespace WebWindowComplex.Models { switch (oldType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { if (newType.Equals(MeasureTypes.PERCENTAGE)) { @@ -381,7 +381,7 @@ namespace WebWindowComplex.Models } case MeasureTypes.PROPORTIONAL: { - if (newType.Equals(MeasureTypes.ABSOLUT)) + if (newType.Equals(MeasureTypes.ABSOLUTE)) { //return Double.Round(ConvertFromPropVal(newType), 2); return ConvertFromPropVal(newType, widthTot, splitList); @@ -394,7 +394,7 @@ namespace WebWindowComplex.Models } case MeasureTypes.PERCENTAGE: { - if (newType.Equals(MeasureTypes.ABSOLUT)) + if (newType.Equals(MeasureTypes.ABSOLUTE)) { //return Double.Round((m_dDimension * m_Parent.Width) / 100, 2); return (m_dDimension * widthTot) / 100; @@ -439,7 +439,7 @@ namespace WebWindowComplex.Models { switch (split.SplitVertList.ElementAt(i).SelMeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { risultato = CalculateWidthSplitGroup(item, split.SplitVertList.ElementAt(i).dDimension); break; @@ -468,7 +468,7 @@ namespace WebWindowComplex.Models Sash sash = (Sash)area; switch (sash.SashList.ElementAt(i).SelMeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { risultato = CalculateWidthSplitGroup(item, sash.SashList.ElementAt(i).dDimension); break; @@ -518,7 +518,7 @@ namespace WebWindowComplex.Models { switch (split.SplitHorizList.ElementAt(i).SelMeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { risultato = CalculateHeightSplitGroup(item, split.SplitVertList.ElementAt(i).dDimension); break; @@ -547,7 +547,7 @@ namespace WebWindowComplex.Models Sash sash = (Sash)area; switch (sash.SashList.ElementAt(i).SelMeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { risultato = CalculateHeightSplitGroup(item, sash.SashList.ElementAt(i).dDimension); break; @@ -646,7 +646,7 @@ namespace WebWindowComplex.Models { switch (MeasureType) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { //return Double.Round(dDimension, 2); return dDimension; @@ -676,7 +676,7 @@ namespace WebWindowComplex.Models { switch (type) { - case MeasureTypes.ABSOLUT: + case MeasureTypes.ABSOLUTE: { //return Double.Round(absolutVal, 2); return absolutVal; @@ -717,7 +717,7 @@ namespace WebWindowComplex.Models double sumPesi = proportionalList.Sum(p => p.dDimension); if (sumPesi == 0) sumPesi = 1; - if (newType.Equals(MeasureTypes.ABSOLUT)) + if (newType.Equals(MeasureTypes.ABSOLUTE)) { return res / sumPesi * dDimension; } @@ -809,7 +809,7 @@ namespace WebWindowComplex.Models private List m_MeasureTypeList = new List { - new IdNameStruct((int)MeasureTypes.ABSOLUT, "Absolut"), + new IdNameStruct((int)MeasureTypes.ABSOLUTE, "Absolute"), new IdNameStruct((int)MeasureTypes.PROPORTIONAL, "Proportional"), new IdNameStruct((int)MeasureTypes.PERCENTAGE, "Percentage"), }; diff --git a/WebWindowComplex/TableComp.razor b/WebWindowComplex/TableComp.razor index 3e4cde4..466aa83 100644 --- a/WebWindowComplex/TableComp.razor +++ b/WebWindowComplex/TableComp.razor @@ -49,6 +49,15 @@
      • + @if (FrameWindow.Shape == Json.WindowConst.Shapes.ARC || + FrameWindow.Shape == Json.WindowConst.Shapes.ARC_FULL || + FrameWindow.Shape == Json.WindowConst.Shapes.DOUBLEARC || + FrameWindow.Shape == Json.WindowConst.Shapes.THREECENTERARC) + { +
    • + +
      • + }
@@ -188,6 +197,14 @@ EC_ReqClose="ReturnTree"> } + else if (currStep == CompileStep.ArcElement) + { + + + }
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs index 20c4d59..16fbfb4 100644 --- a/WebWindowComplex/TableComp.razor.cs +++ b/WebWindowComplex/TableComp.razor.cs @@ -601,9 +601,11 @@ namespace WebWindowComplex new Joint(frame, 3, Joints.FULL_H), new Joint(frame, 4, Joints.FULL_H) }; + FrameArcElement ae = new FrameArcElement(frame, window, 10, true, true); JsonWindow jsonWindow = new JsonWindow("Profilo78", "Pino", "Black", "Vetro BE 2S 4T/16/4T"); JsonFrame jsonFrame = new JsonFrame(Shapes.RECTANGLE, false, 0, 1); jsonWindow.AreaList.Add(jsonFrame); + jsonFrame.ArcElement = ae.Serialize(); foreach (var Dimension in DimensionList) jsonFrame.DimensionList.Add(Dimension.Serialize()); foreach (var Joint in JointList) diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj index be9f69c..a029df9 100644 --- a/WebWindowComplex/WebWindowComplex.csproj +++ b/WebWindowComplex/WebWindowComplex.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.11.2818 + 2.7.12.216 Annamaria Sassi Egalware Componente gestione Configurazioni avanzate Window per LUX @@ -191,6 +191,14 @@ + + + + + + + + diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj index 7678d14..1e3e508 100644 --- a/WebWindowConfigurator/WebWindowConfigurator.csproj +++ b/WebWindowConfigurator/WebWindowConfigurator.csproj @@ -6,7 +6,7 @@ net8.0 enable enable - 2.7.11.2818 + 2.7.12.216 Annamaria Sassi Egalware Componente gestione JWD per LUX @@ -271,6 +271,24 @@ + + + + + + + + + + + + + + + + + +