Egalware/webwindowconfigurator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aggiunto arc element per Frame e Sash (da rivedere)

Browse Source
This commit is contained in:
Annamaria Sassi
2025-12-02 16:44:01 +01:00
parent 5a7987d02b
commit dfe4ecd9d1
28 changed files with 1075 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/Models/Sash.cs
+33 -3
View File
@@ -58,6 +58,18 @@ namespace WebWindowComplex.Models
}
}
public SashArcElement? SashArcElem
{
get
{
return m_SashArcElement;
}
set
{
m_SashArcElement = value!;
}
}
public List<Hardware> 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