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
2026-01-27 16:51:26 +01:00
parent f18f2bb05a
commit 3f96d71c30
10 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Test.UI/Components/Pages/EditJWD.razor.cs
+3 -4
View File
@@ -29,7 +29,7 @@ namespace Test.UI.Components.Pages
DLService.PipeSvg.EA_NewMessage -= PipeSvg_EA_NewMessage;
DLService.PipeShape.EA_NewMessage -= PipeShape_EA_NewMessage;
DLService.PipeHwOpt.EA_NewMessage -= PipeHwOption_EA_NewMessage;
//DLService.PipeElement.EA_NewMessage -= PipeElement_EA_NewMessage;
//DLService.PipeAreaProfile.EA_NewMessage -= PipeAreaProfile_EA_NewMessage;
}
#endregion Public Methods
@@ -350,7 +350,7 @@ namespace Test.UI.Components.Pages
DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
DLService.PipeShape.EA_NewMessage += PipeShape_EA_NewMessage;
DLService.PipeHwOpt.EA_NewMessage += PipeHwOption_EA_NewMessage;
//DLService.PipeElement.EA_NewMessage += PipeElement_EA_NewMessage;
//DLService.PipeAreaProfile.EA_NewMessage += PipeAreaProfile_EA_NewMessage;
}
#endregion Protected Methods
@@ -509,7 +509,7 @@ namespace Test.UI.Components.Pages
await Task.Delay(1);
}
private async void PipeElement_EA_NewMessage(object? sender, EventArgs e)
private async void PipeAreaProfile_EA_NewMessage(object? sender, EventArgs e)
{
// aggiorno visualizzazione
PubSubEventArgs currArgs = (PubSubEventArgs)e;
@@ -551,7 +551,6 @@ namespace Test.UI.Components.Pages
/// <returns></returns>
private async Task ReloadData()
{
//return base.OnInitializedAsync();
AvailHardwareList = new List<Hardware>();
if (File.Exists(cFileHardware))
{
WebWindowComplex/AreaProfiles.cs
+1 -1
View File
@@ -14,7 +14,7 @@ namespace WebWindowComplex
public int GroupId { get; set; }
/// <summary>
/// numero di anta (se è una sash)
/// Numero di anta (se è una sash)
/// </summary>
public int SashId { get; set; }
WebWindowComplex/Compo/AreaSash.razor.cs
+15 -12
View File
@@ -279,20 +279,23 @@ namespace WebWindowComplex.Compo
/// <returns></returns>
private async Task ChangeTypeDimension()
{
CurrSashDim.bDimensionLight = !CurrSashDim.bDimensionLight;
if (CurrSashDim.bDimensionLight)
if (CurrSashDim.SelMeasureType.Equals(MeasureTypes.ABSOLUTE))
{
CurrSashDim.dDimension = CurrSashDim.dDimension -
CurrSashDim.ElementDimensionList.ElementAt(1).dDimension -
CurrSashDim.ElementDimensionList.ElementAt(3).dDimension;
CurrSashDim.bDimensionLight = !CurrSashDim.bDimensionLight;
if (CurrSashDim.bDimensionLight)
{
CurrSashDim.dDimension = CurrSashDim.dDimension -
CurrSashDim.ElementDimensionList.ElementAt(1).dDimension -
CurrSashDim.ElementDimensionList.ElementAt(3).dDimension;
}
else
{
CurrSashDim.dDimension = CurrSashDim.dDimension +
CurrSashDim.ElementDimensionList.ElementAt(1).dDimension +
CurrSashDim.ElementDimensionList.ElementAt(3).dDimension;
}
await EC_UpdateSash.InvokeAsync(CurrSashGroup);
}
else
{
CurrSashDim.dDimension = CurrSashDim.dDimension +
CurrSashDim.ElementDimensionList.ElementAt(1).dDimension +
CurrSashDim.ElementDimensionList.ElementAt(3).dDimension;
}
await EC_UpdateSash.InvokeAsync(CurrSashGroup);
}
/// <summary>
WebWindowComplex/Models/Frame.cs
+50 -45
View File
@@ -679,54 +679,59 @@ namespace WebWindowComplex.Models
/// <returns></returns>
internal double AvailArea()
{
switch(m_Shape)
{
case Shapes.RECTANGLE:
case Shapes.RIGHTCHAMFER:
case Shapes.LEFTCHAMFER:
case Shapes.ARC:
case Shapes.ARC_FULL:
{
// larghezza - elementDim(1) - elementDim(3) + overlapDd + overlapSx
return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension -
ElementDimensionList.ElementAt(1).dDimension -
ElementDimensionList.ElementAt(3).dDimension +
ElementDimensionList.ElementAt(1).dOverlap +
ElementDimensionList.ElementAt(3).dOverlap;
}
case Shapes.DOUBLECHAMFER:
case Shapes.DOUBLEARC:
{
// larghezza - elementDim(1) - elementDim(4) + overlapDd + overlapSx
return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension -
ElementDimensionList.ElementAt(1).dDimension -
ElementDimensionList.ElementAt(4).dDimension +
ElementDimensionList.ElementAt(1).dOverlap +
ElementDimensionList.ElementAt(4).dOverlap;
}
// larghezza - elementDim(1) - elementDim(last) + overlapDd + overlapSx
return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension -
ElementDimensionList.ElementAt(1).dDimension -
ElementDimensionList.Last().dDimension +
ElementDimensionList.ElementAt(1).dOverlap +
ElementDimensionList.Last().dOverlap;
//switch (m_Shape)
//{
// case Shapes.RECTANGLE:
// case Shapes.RIGHTCHAMFER:
// case Shapes.LEFTCHAMFER:
// case Shapes.ARC:
// case Shapes.ARC_FULL:
// {
// // larghezza - elementDim(1) - elementDim(3) + overlapDd + overlapSx
// return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension -
// ElementDimensionList.ElementAt(1).dDimension -
// ElementDimensionList.ElementAt(3).dDimension +
// ElementDimensionList.ElementAt(1).dOverlap +
// ElementDimensionList.ElementAt(3).dOverlap;
// }
// case Shapes.DOUBLECHAMFER:
// case Shapes.DOUBLEARC:
// {
// // larghezza - elementDim(1) - elementDim(4) + overlapDd + overlapSx
// return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension -
// ElementDimensionList.ElementAt(1).dDimension -
// ElementDimensionList.ElementAt(4).dDimension +
// ElementDimensionList.ElementAt(1).dOverlap +
// ElementDimensionList.ElementAt(4).dOverlap;
// }
case Shapes.THREECENTERARC:
{
// larghezza - elementDim(1) - elementDim(5) + overlapDd + overlapSx
return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension -
ElementDimensionList.ElementAt(1).dDimension -
ElementDimensionList.ElementAt(5).dDimension +
ElementDimensionList.ElementAt(1).dOverlap +
ElementDimensionList.ElementAt(5).dOverlap;
}
// case Shapes.THREECENTERARC:
// {
// // larghezza - elementDim(1) - elementDim(5) + overlapDd + overlapSx
// return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension -
// ElementDimensionList.ElementAt(1).dDimension -
// ElementDimensionList.ElementAt(5).dDimension +
// ElementDimensionList.ElementAt(1).dOverlap +
// ElementDimensionList.ElementAt(5).dOverlap;
// }
case Shapes.TRIANGLE:
{
// larghezza
return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension;
}
// case Shapes.TRIANGLE:
// {
// // larghezza
// return DimensionList.FirstOrDefault(x => x.sName.Equals("Width")).dDimension;
// }
case Shapes.CUSTOM:
{
return -1;
}
}
return -1;
// case Shapes.CUSTOM:
// {
// return -1;
// }
// }
}
#endregion Internal Methods
WebWindowComplex/Models/FrameDimension.cs
-2
View File
@@ -177,8 +177,6 @@ namespace WebWindowComplex.Models
private bool m_bIsLen = false;
//private double m_dDimension;
private int m_nIndex;
private string m_sName;
WebWindowComplex/Models/SashDimension.cs
+4 -5
View File
@@ -328,7 +328,10 @@ namespace WebWindowComplex.Models
}
set
{
m_bDimensionLight = value;
if(m_bDimensionLight != value)
{
m_bDimensionLight = value;
}
}
}
@@ -597,8 +600,6 @@ namespace WebWindowComplex.Models
private bool m_bHasHandle;
//private double m_dDimension;
private int m_nSashId;
private List<IdNameStruct> m_OpeningTypeList = new List<IdNameStruct>
@@ -639,8 +640,6 @@ namespace WebWindowComplex.Models
private bool m_bDimensionLight = false;
//private MeasureTypes m_SelMeasureType;
#endregion Private Fields
}
WebWindowComplex/Models/SplitDimension.cs
-16
View File
@@ -470,11 +470,6 @@ namespace WebWindowComplex.Models
return JsonSplitDimension;
}
//internal void SetDimension(double dValue)
//{
// m_dDimension = dValue;
//}
internal void SetIsRelative(bool value)
{
m_bIsRelative = value;
@@ -545,17 +540,6 @@ namespace WebWindowComplex.Models
private bool m_bIsVertListDim = false;
//private double m_dDimension;
//private List<IdNameStruct> m_MeasureTypeList = new List<IdNameStruct>
//{
// new IdNameStruct((int)MeasureTypes.ABSOLUTE, "Absolute"),
// new IdNameStruct((int)MeasureTypes.PROPORTIONAL, "Proportional"),
// new IdNameStruct((int)MeasureTypes.PERCENTAGE, "Percentage"),
//};
//private MeasureTypes m_SelMeasureType;
// reference
private Split m_Parent;
WebWindowComplex/TableComp.razor.cs
+14 -10
View File
@@ -168,6 +168,10 @@ namespace WebWindowComplex
{
get => m_SplittedList;
}
protected List<Split> SplitList
{
get => m_SplitList;
}
protected string SelColorMaterial { get; set; } = "";
protected string SelFamilyHardware { get; set; } = "";
@@ -175,11 +179,6 @@ namespace WebWindowComplex
protected string SelMaterial { get; set; } = ""!;
protected string SelProfile { get; set; } = "";
protected List<Split> SplitList
{
get => m_SplitList;
}
#endregion Protected Properties
#region Protected Methods
@@ -1122,6 +1121,11 @@ namespace WebWindowComplex
{
Sash sash = (Sash)found;
SashDimension anta = sash.SashList.ElementAt(SashIdSearch);
for(int index = anta.ElementDimensionList.Count; index < profileNameList.Count; index++)
{
double valStd = Window.m_ParameterList.GetValueOrDefault(profileNameList.ElementAt(index) + "_DimStd");
anta.ElementDimensionList.Add(new ElementDimension(sash, index + 1, valStd));
}
for (int i = 0; i < anta.ElementDimensionList.Count; i++)
{
anta.ElementDimensionList.ElementAt(i).SetNameElement(profileNameList.ElementAt(i));
@@ -1131,14 +1135,14 @@ namespace WebWindowComplex
case AreaTypes.SPLIT:
{
Split split = (Split)found;
for (int i = 0; i < split.ElemDimHorizList.Count; i++)
{
split.ElemDimHorizList.ElementAt(i).SetNameElement(profileNameList.ElementAt(i));
}
for (int i = split.ElemDimHorizList.Count; i < split.ElemDimVertList.Count; i++)
for (int i = 0; i < split.ElemDimVertList.Count; i++)
{
split.ElemDimVertList.ElementAt(i).SetNameElement(profileNameList.ElementAt(i));
}
for (int i = split.ElemDimVertList.Count; i < split.ElemDimHorizList.Count; i++)
{
split.ElemDimHorizList.ElementAt(i).SetNameElement(profileNameList.ElementAt(i));
}
break;
}
}
WebWindowComplex/WebWindowComplex.csproj
+5 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.8.1.2712</Version>
<Version>2.8.1.2715</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -118,6 +118,10 @@
WebWindowConfigurator/WebWindowConfigurator.csproj
+6 -1
View File
@@ -6,7 +6,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>2.8.1.2712</Version>
<Version>2.8.1.2715</Version>
<Authors>Annamaria Sassi</Authors>
<Company>Egalware</Company>
<Description>Componente gestione JWD per LUX</Description>
@@ -161,6 +161,11 @@