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/Compo/CardSashGroup.razor
-1
View File
@@ -69,7 +69,6 @@
{
<EditJoint CurrRec="joint" EC_Update="UpdateJoint"></EditJoint>
}
</div>
<div class="col-sm-6">
<div class="row">
WebWindowComplex/Compo/CardSplit.razor
+1 -1
View File
@@ -11,7 +11,7 @@
</div>
</div>
<div class="card-body py-2">
<div class="d-flex align-items-center">
<div class="row">
<div class="col-sm-4">
<h5>Split</h5>
</div>
WebWindowComplex/Json/JsonUtility.cs
+1 -7
View File
@@ -398,15 +398,9 @@ namespace WebWindowComplex.Json
}
foreach (var Joint in m_JointList)
newSash.JointList.Add(Joint.Deserialize((Area)ParentArea));
newSash.SetSelHardwareFromId(Hardware);
newSash.SetSelFamilyHardwareFromIndex(Hardware);
newSash.RefreshHardwareList();
//if(Hardware != null && !Hardware.Equals(""))
// newSash.SetSelHardwareFromId(Hardware);
//else
newSash.SetSelHardwareFromId(newSash.SelHardware.Id);
//if (newSash.HardwareList.Count() > 0)
// newSash.SetSelHardwareFromId(newSash.HardwareList.First().Id);
newSash.SetSelHardwareFromId(Hardware);
foreach (var Area in AreaList)
{
var AreaDeserealized = Area.Deserialize(newSash, ParentWindow);
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)
WebWindowComplex/TableComp.razor
+1 -4
View File
@@ -26,7 +26,6 @@
<div class="alert alert-danger">
<div class="fs-3">Errore configurazione:</div>
<div class="col-12">
<ul class="list-group">
@foreach (var item in listErrLink)
{
@@ -135,8 +134,7 @@
}
else
{
Split item = SplitList[currSplit];
<CardSplit SashList="m_SashList" SplitList="m_SplitList" CurrIndex="currSplit" CurrItem="item" EC_SwapTwoAree="SwapTwoAree" EC_RemoveArea="RemoveArea" EC_ChangeStartVert="changeStartVert" EC_ReqClose="ReturnTree"></CardSplit>
<CardSplit SashList="m_SashList" SplitList="m_SplitList" CurrIndex="currSplit" CurrItem="SplitList[currSplit]" EC_SwapTwoAree="SwapTwoAree" EC_RemoveArea="RemoveArea" EC_ChangeStartVert="changeStartVert" EC_ReqClose="ReturnTree"></CardSplit>
}
}
else if (currStep == CompileStep.Sash)
@@ -179,7 +177,6 @@
<div class="alert alert-warning">
<div class="fs-3">Mancata corrispondenza valori:</div>
<div class="col-12 col-md-6 col-lg-3">
<ul class="list-group">
@foreach (var item in listWarnings)
{
WebWindowComplex/TableComp.razor.cs
+8 -8
View File
@@ -279,8 +279,8 @@ namespace WebWindowComplex
}
case AreaTypes.FILL:
{
if ((node.ParentArea.AreaList.Count > 1 && node.ParentArea.AreaList[0].Equals(node)) ||
(node.ParentArea.ParentArea != null && node.ParentArea.ParentArea.AreaList.Count > 1 && node.ParentArea.ParentArea.AreaList[0].AreaList[0].Equals(node)))
if ((node.ParentArea.AreaList.Count > 1 && node.ParentArea.AreaList.First().Equals(node)) ||
(node.ParentArea.ParentArea != null && node.ParentArea.ParentArea.AreaList.Count > 1 && node.ParentArea.ParentArea.AreaList.First().AreaList.First().Equals(node)))
maxCol++;
string nFill;
for (int i = 0; i < FillList.Count; i++)
@@ -302,7 +302,7 @@ namespace WebWindowComplex
// Se il nodo ha fratelli o cugini
if (node.ParentArea.AreaList.Count > 1 || (node.ParentArea.ParentArea != null && node.ParentArea.ParentArea.AreaList.Count > 1))
{
if (node.ParentArea.AreaList[0].Equals(node) || node.ParentArea.ParentArea.AreaList[0].Equals(node))
if (node.ParentArea.AreaList.First().Equals(node) || node.ParentArea.ParentArea.AreaList.First().Equals(node))
maxCol++;
for (int i = 0; i < SplitList.Count; i++)
{
@@ -394,7 +394,7 @@ namespace WebWindowComplex
}
case AreaTypes.SPLITTED:
{
if (node.ParentArea is Split && !IntoSash && node.AreaList[0] is Fill)
if (node.ParentArea is Split && !IntoSash && node.AreaList.First() is Fill)
{
m_SplittedList.Add((Splitted)node);
}
@@ -608,9 +608,9 @@ namespace WebWindowComplex
if (m_PreviousWindow != null)
{
for (int i = 0; i < 2; i++)
m_CurrWindow.AreaList[0].DimensionList[i] = m_PreviousWindow.AreaList[0].DimensionList[i];
m_CurrWindow.AreaList.First().DimensionList[i] = m_PreviousWindow.AreaList.First().DimensionList[i];
for (int i = 0; i < 4; i++)
m_CurrWindow.AreaList[0].JointList[i] = m_PreviousWindow.AreaList[0].JointList[i];
m_CurrWindow.AreaList.First().JointList[i] = m_PreviousWindow.AreaList.First().JointList[i];
}
if (m_CurrWindow != null)
{
@@ -633,8 +633,8 @@ namespace WebWindowComplex
m_SplitList = new List<Split>();
m_SplittedList = new List<Splitted>();
m_ItemTableList = new List<ItemTable>();
CreateWindowsList((m_CurrWindow!).AreaList[0], false);
CreateElementTable(m_CurrWindow.AreaList[0], 1, 1, 1, 1);
CreateWindowsList((m_CurrWindow!).AreaList.First(), false);
CreateElementTable(m_CurrWindow.AreaList.First(), 1, 1, 1, 1);
}
/// <summary>
WebWindowComplex/WebWindowComplex.csproj
+24 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.7.10.1414</Version>
<Version>2.7.10.1511</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -49,4 +49,27 @@