Fix chiamata senza HW iniziale + altre in ordine

This commit is contained in:
Samuele Locatelli
2025-10-29 16:52:59 +01:00
parent 1525dd1da1
commit 9d4d6128c3
10 changed files with 89 additions and 35 deletions
+1 -1
View File
@@ -239,7 +239,7 @@ namespace WebWindowComplex.Models
#region Internal Methods
internal abstract JsonArea Serialize();
internal abstract JsonArea Serialize(bool hideHw);
internal void SetAreaType(AreaTypes AreaType)
{
+2 -2
View File
@@ -84,13 +84,13 @@ namespace WebWindowComplex.Models
return Fill;
}
internal override JsonArea Serialize()
internal override JsonArea Serialize(bool hideHw)
{
if (nCounterGroup < GroupId)
Area.nCounterGroup = GroupId;
JsonFill JsonFill = new JsonFill(FillType, GroupId);
foreach (var Area in AreaList)
JsonFill.AreaList.Add(Area.Serialize());
JsonFill.AreaList.Add(Area.Serialize(hideHw));
return JsonFill;
}
+2 -2
View File
@@ -237,7 +237,7 @@ namespace WebWindowComplex.Models
return NewFrame;
}
internal override JsonArea Serialize()
internal override JsonArea Serialize(bool hideHw)
{
Area.nCounterGroup = 0;
if (nCounterGroup < GroupId)
@@ -248,7 +248,7 @@ namespace WebWindowComplex.Models
foreach (var Joint in JointList)
JsonFrame.JointList.Add(Joint.Serialize());
foreach (var Area in AreaList)
JsonFrame.AreaList.Add(Area.Serialize());
JsonFrame.AreaList.Add(Area.Serialize(hideHw));
return JsonFrame;
}
+4 -3
View File
@@ -655,11 +655,12 @@ namespace WebWindowComplex.Models
m_HwdOptionList.Clear();
}
internal override JsonArea Serialize()
internal override JsonArea Serialize(bool hideHw)
{
if (nCounterGroup < GroupId)
Area.nCounterGroup = GroupId;
JsonSash JsonSash = new JsonSash(m_bIsSashVertical, m_SashType, m_bSashBottomRail, m_nSashBottomRailQty, m_SelHardware.Id, GroupId);
string currHwId = hideHw ? CustomHwId : m_SelHardware.Id;
JsonSash JsonSash = new JsonSash(m_bIsSashVertical, m_SashType, m_bSashBottomRail, m_nSashBottomRailQty, currHwId, GroupId);
foreach (var SashDimension in SashList)
JsonSash.SashList.Add(SashDimension.Serialize());
foreach (var Joint in JointList)
@@ -667,7 +668,7 @@ namespace WebWindowComplex.Models
foreach (var HwOption in HwOptionList)
JsonSash.HwOptionList.Add(HwOption.Serialize());
foreach (var Area in AreaList)
JsonSash.AreaList.Add(Area.Serialize());
JsonSash.AreaList.Add(Area.Serialize(hideHw));
return JsonSash;
}
+2 -2
View File
@@ -369,7 +369,7 @@ namespace WebWindowComplex.Models
return Split;
}
internal override JsonArea Serialize()
internal override JsonArea Serialize(bool hideHw)
{
if (nCounterGroup < GroupId)
Area.nCounterGroup = GroupId;
@@ -382,7 +382,7 @@ namespace WebWindowComplex.Models
foreach (var SplitHoriz in m_SplitHorizList)
JsonSplit.SplitHorizList.Add(SplitHoriz.Serialize());
foreach (var Area in AreaList)
JsonSplit.AreaList.Add(Area.Serialize());
JsonSplit.AreaList.Add(Area.Serialize(hideHw));
return JsonSplit;
}
+2 -2
View File
@@ -42,13 +42,13 @@ namespace WebWindowComplex.Models
return Splitted;
}
internal override JsonArea Serialize()
internal override JsonArea Serialize(bool hideHw)
{
if (nCounterGroup < GroupId)
Area.nCounterGroup = GroupId;
JsonSplitted JsonSplitted = new JsonSplitted(GroupId);
foreach (var Area in AreaList)
JsonSplitted.AreaList.Add(Area.Serialize());
JsonSplitted.AreaList.Add(Area.Serialize(hideHw));
return JsonSplitted;
}
+7 -2
View File
@@ -103,11 +103,16 @@ namespace WebWindowComplex.Models
}
}
internal JsonWindow Serialize()
/// <summary>
/// Serializzazione dell'oggetto windows
/// </summary>
/// <param name="hideHw">Hide hw x preview SVG veloci</param>
/// <returns></returns>
internal JsonWindow Serialize(bool hideHw = false)
{
JsonWindow JsonWindow = new JsonWindow(sProfilePath, sMaterial, sColorMaterial, sGlass);
foreach (var Area in AreaList)
JsonWindow.AreaList.Add(Area.Serialize());
JsonWindow.AreaList.Add(Area.Serialize(hideHw));
return JsonWindow;
}