diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 2ed12b8c..4473231e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -196,11 +196,11 @@ namespace VEPROMS.CSLA.Library public Layout(XmlNode xmlNode) : base(xmlNode) { } public Layout() : base() { } #region TopRow - private LazyLoad _TopRow; + private LazyLoad _TopRow; [Category("Layout")] [DisplayName("Top Row on Printed Page")] [Description("Top Row on Printed Page")] - public int? TopRow + public float? TopRow { get { @@ -209,11 +209,11 @@ namespace VEPROMS.CSLA.Library } #endregion #region FooterLength - private LazyLoad _FooterLength; + private LazyLoad _FooterLength; [Category("Location")] [DisplayName("Number of lines required for footer")] [Description("Number of lines required for footer")] - public int? FooterLength + public float? FooterLength { get { @@ -222,11 +222,11 @@ namespace VEPROMS.CSLA.Library } #endregion #region LeftMargin - private LazyLoad _LeftMargin; + private LazyLoad _LeftMargin; [Category("Location")] [DisplayName("Size of left margin")] [Description("Size of left margin")] - public int? LeftMargin + public float? LeftMargin { get { @@ -235,11 +235,11 @@ namespace VEPROMS.CSLA.Library } #endregion #region PageLength - private LazyLoad _PageLength; + private LazyLoad _PageLength; [Category("Location")] [DisplayName("Length of Page")] [Description("Length of Page")] - public int? PageLength + public float? PageLength { get { @@ -248,11 +248,11 @@ namespace VEPROMS.CSLA.Library } #endregion #region PageWidth - private LazyLoad _PageWidth; + private LazyLoad _PageWidth; [Category("Location")] [DisplayName("Width of Page")] [Description("Width of Page")] - public int? PageWidth + public float? PageWidth { get { @@ -309,11 +309,11 @@ namespace VEPROMS.CSLA.Library public Top(XmlNode xmlNode) : base(xmlNode) { } public Top() : base() { } #region Margin - private LazyLoad _Margin; + private LazyLoad _Margin; [Category("Continue Msg")] [DisplayName("Margin for top msg")] [Description("Margin for top msg")] - public int? Margin + public float? Margin { get { @@ -356,11 +356,11 @@ namespace VEPROMS.CSLA.Library public Bottom(XmlNode xmlNode) : base(xmlNode) { } public Bottom() : base() { } #region Margin - private LazyLoad _Margin; + private LazyLoad _Margin; [Category("Continue Msg")] [DisplayName("Margin for bottom msg")] [Description("Margin for bottom msg")] - public int? Margin + public float? Margin { get { diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs index 6caab392..25871f5b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs @@ -95,22 +95,22 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Token, "@Token"); } } - private LazyLoad _Row; + private LazyLoad _Row; [Category("Location")] [DisplayName("Vertical Position")] [Description("Vertical Position")] - public int? Row + public float? Row { get { return LazyLoad(ref _Row, "@Row"); } } - private LazyLoad _Col; + private LazyLoad _Col; [Category("Location")] [DisplayName("Horizontal Position")] [Description("Horizontal Position")] - public int? Col + public float? Col { get { diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 89c1ab0b..8eedc068 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -71,11 +71,12 @@ namespace VEPROMS.CSLA.Library public class VE_Font : vlnFormatItem { public VE_Font(XmlNode xmlNode) : base(xmlNode) { } - public VE_Font(string family, int size, E_Style style) + public VE_Font(string family, int size, E_Style style, float CPI) { _Family = new LazyLoad(family); _Size = new LazyLoad(size); _Style = new LazyLoad(style); + _CPI = new LazyLoad(CPI); } private LazyLoad _Family; private Font _WindowsFont; @@ -134,6 +135,22 @@ namespace VEPROMS.CSLA.Library // _Style.Value = value; //} } + private LazyLoad _CPI; + public float? CPI + { + get + { + return LazyLoad(ref _CPI, "Font/@CPI"); + } + } + public float CharsToTwips + { + get + { + return (72 / (CPI ?? 12)); + } + + } public override string ToString() { return string.Format("{0}, {1} pt, {2}", Family, Size, Style); @@ -1143,8 +1160,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UIMark, "@UIMark"); } } - private LazyLoad _CheckOffWidAdjust; - public int? CheckOffWidAdjust + private LazyLoad _CheckOffWidAdjust; + public float? CheckOffWidAdjust { get { @@ -1565,8 +1582,8 @@ namespace VEPROMS.CSLA.Library { public SectionNumber(XmlNode xmlNode) : base(xmlNode) { } public SectionNumber() : base() { } - private LazyLoad _Pos; - public int? Pos + private LazyLoad _Pos; + public float? Pos { get { @@ -1597,8 +1614,8 @@ namespace VEPROMS.CSLA.Library { public SectionHeader(XmlNode xmlNode) : base(xmlNode) { } public SectionHeader() : base() { } - private LazyLoad _Pos; - public int? Pos + private LazyLoad _Pos; + public float? Pos { get { @@ -2365,8 +2382,8 @@ namespace VEPROMS.CSLA.Library return (_Separator == null) ?_Separator = new Separator(SelectSingleNode("Separator")):_Separator; } } - private LazyLoad _LastLineToStartStep; - public int? LastLineToStartStep + private LazyLoad _LastLineToStartStep; + public float? LastLineToStartStep { get { @@ -2381,32 +2398,32 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _LineDrawingOption, "@LineDrawingOption"); } } - private LazyLoad _ColS; - public int? ColS + private LazyLoad _ColS; + public float? ColS { get { return LazyLoad(ref _ColS, "@ColS"); } } - private LazyLoad _ColT; - public int? ColT + private LazyLoad _ColT; + public float? ColT { get { return LazyLoad(ref _ColT, "@ColT"); } } - private LazyLoad _ColAbs; - public int? ColAbs + private LazyLoad _ColAbs; + public float? ColAbs { get { return LazyLoad(ref _ColAbs, "@ColAbs"); } } - private LazyLoad _WidT; - public int? WidT + private LazyLoad _WidT; + public float? WidT { get { @@ -2461,8 +2478,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _WidSTablePrint, "@WidSTablePrint"); } } - private LazyLoad _AdjRNOCol; - public int? AdjRNOCol + private LazyLoad _AdjRNOCol; + public float? AdjRNOCol { get { @@ -2835,16 +2852,16 @@ namespace VEPROMS.CSLA.Library public class TopOfPage : vlnFormatItem { public TopOfPage(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _Row; - public int? Row + private LazyLoad _Row; + public float? Row { get { return LazyLoad(ref _Row, "@Row"); } } - private LazyLoad _Col; - public int? Col + private LazyLoad _Col; + public float? Col { get { @@ -2888,16 +2905,16 @@ namespace VEPROMS.CSLA.Library public class StepSectionEditData : vlnFormatItem { public StepSectionEditData(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _ColSScreenAdj; - public int? ColSScreenAdj + private LazyLoad _ColSScreenAdj; + public float? ColSScreenAdj { get { return LazyLoad(ref _ColSScreenAdj, "@ColSScreenAdj"); } } - private LazyLoad _ScrnAdjRNOText; - public int? ScrnAdjRNOText + private LazyLoad _ScrnAdjRNOText; + public float? ScrnAdjRNOText { get { @@ -2918,8 +2935,8 @@ namespace VEPROMS.CSLA.Library public class StepSectionPrintData : vlnFormatItem { public StepSectionPrintData(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _ImmStepHdrCol; - public int? ImmStepHdrCol + private LazyLoad _ImmStepHdrCol; + public float? ImmStepHdrCol { get { @@ -3140,16 +3157,16 @@ namespace VEPROMS.CSLA.Library public class TableOfContentsData : vlnFormatItem { public TableOfContentsData(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _TofCSecNumPos; - public int? TofCSecNumPos + private LazyLoad _TofCSecNumPos; + public float? TofCSecNumPos { get { return LazyLoad(ref _TofCSecNumPos, "@TofCSecNumPos"); } } - private LazyLoad _TofCSecTitlePos; - public int? TofCSecTitlePos + private LazyLoad _TofCSecTitlePos; + public float? TofCSecTitlePos { get { @@ -3164,8 +3181,8 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TofCSecTitleLen, "@TofCSecTitleLen"); } } - private LazyLoad _TofCPageNumPos; - public int? TofCPageNumPos + private LazyLoad _TofCPageNumPos; + public float? TofCPageNumPos { get { @@ -3214,40 +3231,40 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } - private LazyLoad _SecNumPositionAdj; - public int? SecNumPositionAdj + private LazyLoad _SecNumPositionAdj; + public float? SecNumPositionAdj { get { return LazyLoad(ref _SecNumPositionAdj, "@SecNumPositionAdj"); } } - private LazyLoad _SecTitlePositionAdj; - public int? SecTitlePositionAdj + private LazyLoad _SecTitlePositionAdj; + public float? SecTitlePositionAdj { get { return LazyLoad(ref _SecTitlePositionAdj, "@SecTitlePositionAdj"); } } - private LazyLoad _ColSByLevel; - public int? ColSByLevel + private LazyLoad _ColSByLevel; + public float? ColSByLevel { get { return LazyLoad(ref _ColSByLevel, "@ColSByLevel"); } } - private LazyLoad _TofCPositionAdj; - public int? TofCPositionAdj + private LazyLoad _TofCPositionAdj; + public float? TofCPositionAdj { get { return LazyLoad(ref _TofCPositionAdj, "@TofCPositionAdj"); } } - private LazyLoad _WidSAdjByLevel; - public int? WidSAdjByLevel + private LazyLoad _WidSAdjByLevel; + public float? WidSAdjByLevel { get { @@ -4387,48 +4404,48 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Index, "@Index"); } } - private LazyLoad _Start; - public int? Start + private LazyLoad _Start; + public float? Start { get { return LazyLoad(ref _Start, "@Start"); } } - private LazyLoad _End; - public int? End + private LazyLoad _End; + public float? End { get { return LazyLoad(ref _End, "@End"); } } - private LazyLoad _TxtStart; - public int? TxtStart + private LazyLoad _TxtStart; + public float? TxtStart { get { return LazyLoad(ref _TxtStart, "@TxtStart"); } } - private LazyLoad _TxtWidth; - public int? TxtWidth + private LazyLoad _TxtWidth; + public float? TxtWidth { get { return LazyLoad(ref _TxtWidth, "@TxtWidth"); } } - private LazyLoad _Height; - public int? Height + private LazyLoad _Height; + public float? Height { get { return LazyLoad(ref _Height, "@Height"); } } - private LazyLoad _TabPos; - public int? TabPos + private LazyLoad _TabPos; + public float? TabPos { get { diff --git a/PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs index cdee4cce..e28b07bb 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/vlnFormat.cs @@ -369,6 +369,15 @@ namespace VEPROMS.CSLA.Library } return ll.Value; } + public float? LazyLoad(ref LazyLoad ll, string xPath) + { + if (ll == null) + { + XmlNode xn = SelectSingleNode(xPath); + ll = new LazyLoad(RetrieveFloat(xPath, xn)); + } + return ll.Value; + } protected int? RetrieveInt(string xPath, XmlNode xn) { int? value = null; @@ -384,6 +393,21 @@ namespace VEPROMS.CSLA.Library } return value; } + protected float? RetrieveFloat(string xPath, XmlNode xn) + { + float? value = null; + if (xn != null) + { + float fValue = 0; + if (!float.TryParse(xn.InnerText, out fValue)) + { + Console.WriteLine(string.Format("'{0}'\r\n'{1}'\r\n'{2}' could not be converted to float?", MyFormat.FullName, MyPath + "/" + xPath, xn.InnerText)); + throw (new Exception(string.Format("{0} = '{1}' could not be converted to float?", xPath, xn.InnerText))); + } + value = fValue; + } + return value; + } public Nullable LazyLoad(ref LazyLoad> ll, string xPath) where T:struct {