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
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;