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

Correzioni

Browse Source
This commit is contained in:
Annamaria Sassi
2025-10-15 11:06:52 +02:00
parent 90e6bc799a
commit 0b01ee68d9
15 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/Models/Fill.cs
+1 -1
View File
@@ -106,7 +106,7 @@ namespace WebWindowComplex.Models
private List<IdNameStruct> m_FillTypeList = new List<IdNameStruct>
{
new IdNameStruct((int)FillTypes.GLASS, "SvgPreview"),
new IdNameStruct((int)FillTypes.GLASS, "Glass"),
new IdNameStruct((int)FillTypes.WOOD, "Wood")
};
WebWindowComplex/Models/FrameDimension.cs
+2 -2
View File
@@ -97,9 +97,9 @@ namespace WebWindowComplex.Models
private string m_sName;
// valore massimo e minimo della dimensione del frame
// valore massimo della dimensione del frame
private int MaxDim = 4000;
// valore minimo della dimensione del frame
private int MinDim = 600;
#endregion Private Fields
WebWindowComplex/Models/Sash.cs
+11 -11
View File
@@ -133,7 +133,7 @@ namespace WebWindowComplex.Models
dLastDimension += m_SashList[SashList.Count - 1].dDimension;
SashList[SashList.Count - 1].SetDimension(dLastDimension);
if (value == 1)
SashList[0].SetHasHandle(true);
SashList.First().SetHasHandle(true);
}
else
{
@@ -142,11 +142,11 @@ namespace WebWindowComplex.Models
}
if (m_SashList.Count == 0)
{
Area child = AreaList[0];
Area child = AreaList.First();
// Se nella singola anta ho uno split
if (!(child is Fill))
{
child = child.AreaList[0].AreaList[0];
child = child.AreaList.First().AreaList.First();
}
child.SetParentArea(this.ParentArea);
this.ParentArea.AreaList.Remove(this);
@@ -157,10 +157,10 @@ namespace WebWindowComplex.Models
{
// Metto come padre dell'area nello splitted l'anta stessa
List<Area> ContentArea = new List<Area>();
ContentArea.Add(AreaList[0].AreaList[0]);
ContentArea[0].SetParentArea(this);
ContentArea.Add(AreaList.First().AreaList.First());
ContentArea.First().SetParentArea(this);
AreaList.Clear();
AreaList.Add(ContentArea[0]);
AreaList.Add(ContentArea.First());
}
else
{
@@ -174,7 +174,7 @@ namespace WebWindowComplex.Models
foreach (Area area in AreaList)
{
if (area is Splitted)
ContentArea.Add(area.AreaList[0]);
ContentArea.Add(area.AreaList.First());
else
ContentArea.Add(area);
}
@@ -637,7 +637,7 @@ namespace WebWindowComplex.Models
{
if (m_HardwareList.Count > 0)
{
m_SelHardware = m_HardwareList[0];
m_SelHardware = m_HardwareList.First();
}
}
@@ -732,8 +732,8 @@ namespace WebWindowComplex.Models
SelHardware = m_HardwareCompleteList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
else
SelHardware = m_HardwareList.FirstOrDefault(x => x.Id.Equals(sId)) ?? new Hardware("", "", "", Enums.OpeningTypes.Null, "", 0, 0);
if (SelHardware == null)
SelHardware = m_HardwareList[0];
if (SelHardware.Id == "")
SelHardware = m_HardwareList.First();
//SelFamilyHardware = m_SelHardware.FamilyName;
}
@@ -788,7 +788,7 @@ namespace WebWindowComplex.Models
}
else
{
answ = GetOpeningType(m_SashList[0].OpeningType);
answ = GetOpeningType(m_SashList.First().OpeningType);
}
return answ;
}
WebWindowComplex/Models/Split.cs
+4
View File
@@ -319,7 +319,11 @@ namespace WebWindowComplex.Models
newSplit.SetIdGroup(nCounterGroup);
newSplit.SetSplitStartVert(bSplitStartVert);
newSplit.SetSplitQtyVert(nSplitQtyVert);
for (int i = 0; i < SplitVertList.Count; i++)
newSplit.SplitVertList.ElementAt(i).SetDimension(SplitVertList.ElementAt(i).dDimension);
newSplit.SetSplitQtyHoriz(nSplitQtyHoriz);
for (int i = 0; i < SplitHorizList.Count; i++)
newSplit.SplitHorizList.ElementAt(i).SetDimension(SplitHorizList.ElementAt(i).dDimension);
newSplit.SetSplitShape(SelSplitShape, true);
newSplit.SetAreaType(AreaType);
foreach (var item in AreaList)