- Eliminazioni commenti
- Eliminazione funzioni non più usate - Eliminazione pagine razor sostituite
This commit is contained in:
@@ -642,6 +642,7 @@ namespace WebWindowComplex.Models
|
||||
#endregion Public Methods
|
||||
|
||||
#region Internal Methods
|
||||
|
||||
internal void SetIsDimensionLight(bool DimensionLight)
|
||||
{
|
||||
m_IsbDimensionLight = DimensionLight;
|
||||
@@ -670,34 +671,34 @@ namespace WebWindowComplex.Models
|
||||
return newSash;
|
||||
}
|
||||
|
||||
internal OpeningSides GetOpeningSide(Openings OpeningType)
|
||||
{
|
||||
switch (OpeningType)
|
||||
{
|
||||
case Openings.TURNONLY_LEFT:
|
||||
case Openings.TILTTURN_LEFT:
|
||||
case Openings.TILTONLY_TOP:
|
||||
case Openings.COMPLANARSLIDE_LEFT:
|
||||
case Openings.LIFTSLIDE_LEFT:
|
||||
{
|
||||
return OpeningSides.LEFT;
|
||||
}
|
||||
//internal OpeningSides GetOpeningSide(Openings OpeningType)
|
||||
//{
|
||||
// switch (OpeningType)
|
||||
// {
|
||||
// case Openings.TURNONLY_LEFT:
|
||||
// case Openings.TILTTURN_LEFT:
|
||||
// case Openings.TILTONLY_TOP:
|
||||
// case Openings.COMPLANARSLIDE_LEFT:
|
||||
// case Openings.LIFTSLIDE_LEFT:
|
||||
// {
|
||||
// return OpeningSides.LEFT;
|
||||
// }
|
||||
|
||||
case Openings.TURNONLY_RIGHT:
|
||||
case Openings.TILTTURN_RIGHT:
|
||||
case Openings.TILTONLY_BOTTOM:
|
||||
case Openings.COMPLANARSLIDE_RIGHT:
|
||||
case Openings.LIFTSLIDE_RIGHT:
|
||||
{
|
||||
return OpeningSides.RIGHT;
|
||||
}
|
||||
// case Openings.TURNONLY_RIGHT:
|
||||
// case Openings.TILTTURN_RIGHT:
|
||||
// case Openings.TILTONLY_BOTTOM:
|
||||
// case Openings.COMPLANARSLIDE_RIGHT:
|
||||
// case Openings.LIFTSLIDE_RIGHT:
|
||||
// {
|
||||
// return OpeningSides.RIGHT;
|
||||
// }
|
||||
|
||||
default:
|
||||
{
|
||||
return OpeningSides.NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
// default:
|
||||
// {
|
||||
// return OpeningSides.NULL;
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
internal Enums.OpeningTypes GetOpeningType(Openings OpeningType)
|
||||
{
|
||||
@@ -797,11 +798,6 @@ namespace WebWindowComplex.Models
|
||||
}
|
||||
}
|
||||
|
||||
internal void SetIsMeasureGlass(bool IsMeasureGlass)
|
||||
{
|
||||
m_bIsMeasureGlass = IsMeasureGlass;
|
||||
}
|
||||
|
||||
internal void SetIsSashVertical(bool IsSashVertical)
|
||||
{
|
||||
m_bIsSashVertical = IsSashVertical;
|
||||
@@ -815,6 +811,10 @@ namespace WebWindowComplex.Models
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Metodo per impostare opzioni hardware da xml
|
||||
/// </summary>
|
||||
/// <param name="OptionXml"></param>
|
||||
internal void SetHardwareOption(string OptionXml)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(OptionXml))
|
||||
@@ -928,10 +928,10 @@ namespace WebWindowComplex.Models
|
||||
}
|
||||
}
|
||||
|
||||
internal void SetSashType(SashTypes SashType)
|
||||
{
|
||||
m_SashType = SashType;
|
||||
}
|
||||
//internal void SetSashType(SashTypes SashType)
|
||||
//{
|
||||
// m_SashType = SashType;
|
||||
//}
|
||||
|
||||
internal string SetSelFamilyHardwareFromIndex(string codHardware)
|
||||
{
|
||||
@@ -978,6 +978,11 @@ namespace WebWindowComplex.Models
|
||||
if (split.SplitVertList.Count > 0)
|
||||
{
|
||||
double dim = width;
|
||||
double widthGlass = width;
|
||||
foreach (var elem in split.ElemDimVertList)
|
||||
{
|
||||
widthGlass = widthGlass - elem.dDimension;
|
||||
}
|
||||
switch (split.SplitVertList.ElementAt(i).SelMeasureType)
|
||||
{
|
||||
case MeasureTypes.ABSOLUTE:
|
||||
@@ -987,27 +992,19 @@ namespace WebWindowComplex.Models
|
||||
}
|
||||
case MeasureTypes.PROPORTIONAL:
|
||||
{
|
||||
double widthGlass = width;
|
||||
|
||||
AreaDimension ad = new AreaDimension(split.SplitVertList.ElementAt(i).dDimension, split.SplitVertList.ElementAt(i).SelMeasureType, split.SplitVertList.ElementAt(i).Parent);
|
||||
List<AreaDimension> adList = new List<AreaDimension>();
|
||||
foreach (var it in split.SplitVertList)
|
||||
{
|
||||
adList.Add(new AreaDimension(it.dDimension, it.SelMeasureType, it.Parent));
|
||||
}
|
||||
foreach (var elem in split.ElemDimVertList)
|
||||
{
|
||||
widthGlass = widthGlass - elem.dDimension;
|
||||
}
|
||||
dim = ad.ConvertFromPropVal(adList, MeasureTypes.ABSOLUTE, widthGlass);
|
||||
break;
|
||||
}
|
||||
case MeasureTypes.PERCENTAGE:
|
||||
{
|
||||
foreach (var elem in split.ElemDimVertList)
|
||||
{
|
||||
dim = dim - elem.dDimension;
|
||||
}
|
||||
dim = split.SplitVertList.ElementAt(i).dDimension * dim / 100;
|
||||
dim = split.SplitVertList.ElementAt(i).dDimension * widthGlass / 100;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1094,6 +1091,12 @@ namespace WebWindowComplex.Models
|
||||
else
|
||||
{
|
||||
double dim = height;
|
||||
double widthGlass = height;
|
||||
int minSubArea = split.ElemDimHorizList.Min(x => x.nSubArea);
|
||||
foreach (var elem in split.ElemDimHorizList.Where(x => x.nSubArea == minSubArea))
|
||||
{
|
||||
widthGlass = widthGlass - elem.dDimension;
|
||||
}
|
||||
switch (split.SplitHorizList.ElementAt(i).SelMeasureType)
|
||||
{
|
||||
case MeasureTypes.ABSOLUTE:
|
||||
@@ -1103,29 +1106,19 @@ namespace WebWindowComplex.Models
|
||||
}
|
||||
case MeasureTypes.PROPORTIONAL:
|
||||
{
|
||||
double widthGlass = height;
|
||||
|
||||
AreaDimension ad = new AreaDimension(split.SplitHorizList.ElementAt(i).dDimension, split.SplitHorizList.ElementAt(i).SelMeasureType, split.SplitHorizList.ElementAt(i).Parent);
|
||||
List<AreaDimension> adList = new List<AreaDimension>();
|
||||
foreach (var it in split.SplitHorizList)
|
||||
{
|
||||
adList.Add(new AreaDimension(it.dDimension, it.SelMeasureType, it.Parent));
|
||||
}
|
||||
int minSubArea = split.ElemDimHorizList.Min(x=>x.nSubArea);
|
||||
foreach (var elem in split.ElemDimHorizList.Where(x=>x.nSubArea == minSubArea))
|
||||
{
|
||||
widthGlass = widthGlass - elem.dDimension;
|
||||
}
|
||||
dim = ad.ConvertFromPropVal(adList, MeasureTypes.ABSOLUTE, widthGlass);
|
||||
break;
|
||||
}
|
||||
case MeasureTypes.PERCENTAGE:
|
||||
{
|
||||
int minSubArea = split.ElemDimHorizList.Min(x => x.nSubArea);
|
||||
foreach (var elem in split.ElemDimHorizList.Where(x => x.nSubArea == minSubArea))
|
||||
{
|
||||
dim = dim - elem.dDimension;
|
||||
}
|
||||
dim = split.SplitHorizList.ElementAt(i).dDimension * dim / 100;
|
||||
dim = split.SplitHorizList.ElementAt(i).dDimension * widthGlass / 100;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1156,20 +1149,16 @@ namespace WebWindowComplex.Models
|
||||
/// </summary>
|
||||
private const string CustomHwId = "000000";
|
||||
|
||||
private bool m_bIsMeasureGlass;
|
||||
|
||||
private bool m_bIsSashVertical;
|
||||
|
||||
private bool m_bSashBottomRail;
|
||||
|
||||
private string m_CurrShape = "";
|
||||
private List<Hardware> m_HardwareList = new List<Hardware>();
|
||||
|
||||
private List<AGBOption> m_HwOptionList = new List<AGBOption>();
|
||||
private Dictionary<string, string> m_SelHwOptionList = new Dictionary<string, string>();
|
||||
|
||||
private int m_nSashBottomRailQty;
|
||||
|
||||
private List<ElementDimension> m_BottomRailElemDimList = new List<ElementDimension>();
|
||||
private List<IdNameStruct> m_OrientationSashTypeList = new List<IdNameStruct>
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user