diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs
index 514d0d0..3741b33 100644
--- a/Test.UI/Components/Pages/EditJWD.razor.cs
+++ b/Test.UI/Components/Pages/EditJWD.razor.cs
@@ -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
///
private async Task ReloadData()
{
- //return base.OnInitializedAsync();
AvailHardwareList = new List();
if (File.Exists(cFileHardware))
{
diff --git a/WebWindowComplex/AreaProfiles.cs b/WebWindowComplex/AreaProfiles.cs
index 4c19d02..9bf14f7 100644
--- a/WebWindowComplex/AreaProfiles.cs
+++ b/WebWindowComplex/AreaProfiles.cs
@@ -14,7 +14,7 @@ namespace WebWindowComplex
public int GroupId { get; set; }
///
- /// numero di anta (se è una sash)
+ /// Numero di anta (se è una sash)
///
public int SashId { get; set; }
diff --git a/WebWindowComplex/Compo/AreaSash.razor.cs b/WebWindowComplex/Compo/AreaSash.razor.cs
index 9f80c50..96899dd 100644
--- a/WebWindowComplex/Compo/AreaSash.razor.cs
+++ b/WebWindowComplex/Compo/AreaSash.razor.cs
@@ -279,20 +279,23 @@ namespace WebWindowComplex.Compo
///
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);
}
///
diff --git a/WebWindowComplex/Models/Frame.cs b/WebWindowComplex/Models/Frame.cs
index 19d75b2..95685ac 100644
--- a/WebWindowComplex/Models/Frame.cs
+++ b/WebWindowComplex/Models/Frame.cs
@@ -679,54 +679,59 @@ namespace WebWindowComplex.Models
///
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
diff --git a/WebWindowComplex/Models/FrameDimension.cs b/WebWindowComplex/Models/FrameDimension.cs
index dbde1c9..da3f8ac 100644
--- a/WebWindowComplex/Models/FrameDimension.cs
+++ b/WebWindowComplex/Models/FrameDimension.cs
@@ -177,8 +177,6 @@ namespace WebWindowComplex.Models
private bool m_bIsLen = false;
- //private double m_dDimension;
-
private int m_nIndex;
private string m_sName;
diff --git a/WebWindowComplex/Models/SashDimension.cs b/WebWindowComplex/Models/SashDimension.cs
index c4bfe08..c708f3e 100644
--- a/WebWindowComplex/Models/SashDimension.cs
+++ b/WebWindowComplex/Models/SashDimension.cs
@@ -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 m_OpeningTypeList = new List
@@ -639,8 +640,6 @@ namespace WebWindowComplex.Models
private bool m_bDimensionLight = false;
- //private MeasureTypes m_SelMeasureType;
-
#endregion Private Fields
}
diff --git a/WebWindowComplex/Models/SplitDimension.cs b/WebWindowComplex/Models/SplitDimension.cs
index f00152a..f51736f 100644
--- a/WebWindowComplex/Models/SplitDimension.cs
+++ b/WebWindowComplex/Models/SplitDimension.cs
@@ -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 m_MeasureTypeList = new List
- //{
- // 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;
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 652c8cf..26ad4d7 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -168,6 +168,10 @@ namespace WebWindowComplex
{
get => m_SplittedList;
}
+ protected List 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 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;
}
}
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index b26abdd..d765ef4 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.8.1.2712
+ 2.8.1.2715
Annamaria Sassi
Egalware
Componente gestione Configurazioni avanzate Window per LUX
@@ -118,6 +118,10 @@
+
+
+
+
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index 8578e7a..0bb6e8a 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
net8.0
enable
enable
- 2.8.1.2712
+ 2.8.1.2715
Annamaria Sassi
Egalware
Componente gestione JWD per LUX
@@ -161,6 +161,11 @@
+
+
+
+
+