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

Update catena aggiornamenti sath

Browse Source
This commit is contained in:
Samuele Locatelli
2025-10-23 17:27:45 +02:00
parent d477fb9319
commit d8da5ed827
5 changed files with 166 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebWindowComplex/Models/Area.cs
+33 -29
View File
@@ -106,7 +106,7 @@ namespace WebWindowComplex.Models
// Creo area sash di default
Sash SashArea = Sash.CreateSash(ParentArea);
// ricerco tra tutti gli hw disponibili...
string sShape = FindSashShape();
var listHwValid = Sash
.m_HardwareCompleteList
@@ -116,41 +116,45 @@ namespace WebWindowComplex.Models
{
// seleziono la famiglia del primo hw trovato...
SashArea.SetSelFamilyHardware(listHwValid.FamilyName);
SashArea.ReqRefreshShape();
#if false
SashArea.ReqRefreshShape();
#endif
SashArea.RefreshHardwareList();
if (SashArea.HardwareList.Count == 0)
{
answ = true;
//answ = true;
SashArea.SetSelHardwareFromId("000000");
}
else
{
SashArea.SetSelHardwareFromId(SashArea.HardwareList.First().Id);
// Salvo gli oggetti già presenti e li cancello da AreaList
List<Area> ContentArea = new List<Area>();
ContentArea.Add(AreaList[0]);
AreaList.Remove(AreaList[0]);
// Aggiungo area
AreaList.Add(SashArea);
if (SashArea.nSashQty == 1)
{
// Inserisco il riempimento precedente
AreaList[0].AreaList.Add(ContentArea[0]);
AreaList[0].AreaList[0].SetParentArea(AreaList[0]);
}
else
{
// All'area Sash aggiunto uno Splitted per ogni anta
for (int i = 1; i < SashArea.nSashQty; i++)
{
AreaList[0].AreaList.Add(Splitted.CreateSplitted(SashArea));
}
Fill fill2 = (Fill)ContentArea[0];
for (int i = 1; i < SashArea.nSashQty; i++)
{
AreaList[0].AreaList[1].AreaList.Add(Fill.CreateFill(AreaList[0].AreaList[1], fill2.FillType));
}
}
ParentWindow.OnUpdatePreview(ParentWindow.sSerialized());
}
// Salvo gli oggetti già presenti e li cancello da AreaList
List<Area> ContentArea = new List<Area>();
ContentArea.Add(AreaList[0]);
AreaList.Remove(AreaList[0]);
// Aggiungo area
AreaList.Add(SashArea);
if (SashArea.nSashQty == 1)
{
// Inserisco il riempimento precedente
AreaList[0].AreaList.Add(ContentArea[0]);
AreaList[0].AreaList[0].SetParentArea(AreaList[0]);
}
else
{
// All'area Sash aggiunto uno Splitted per ogni anta
for (int i = 1; i < SashArea.nSashQty; i++)
{
AreaList[0].AreaList.Add(Splitted.CreateSplitted(SashArea));
}
Fill fill2 = (Fill)ContentArea[0];
for (int i = 1; i < SashArea.nSashQty; i++)
{
AreaList[0].AreaList[1].AreaList.Add(Fill.CreateFill(AreaList[0].AreaList[1], fill2.FillType));
}
}
ParentWindow.OnUpdatePreview(ParentWindow.sSerialized());
}
return answ;
}
WebWindowComplex/Models/Sash.cs
+5 -2
View File
@@ -540,7 +540,11 @@ namespace WebWindowComplex.Models
public void SetSelFamilyHardware(string sFamilyHw)
{
m_SelFamilyHardware = sFamilyHw;
ReqRefreshShape();
// se ho la shape aggiorno elenco HW
if (!string.IsNullOrEmpty(m_CurrShape))
{
RefreshHardwareList();
}
RefreshHardwareOptionList();
SetFirstHardware();
}
@@ -773,7 +777,6 @@ namespace WebWindowComplex.Models
.Select(x => x.FamilyName)
.FirstOrDefault();
SetSelFamilyHardware(item ?? "");
//SelFamilyHardware = item ?? "";
}
return SelFamilyHardware;
}