diff --git a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs index ccaab2ab..02dbbbf2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/ENums.cs @@ -22,7 +22,7 @@ namespace VEPROMS.CSLA.Library ApproveGenericBack = 0x0200, DistributeApproved = 0x0400, OutsideTransitions = 0x0800, - EnhancedBackGrounds = 0x1000, + EnhancedBackgrounds = 0x1000, EnhancedDeviations = 0x2000, AutoTableOfContents = 0x4000, AutoPlacekeeper = 0x8000 diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index e2001751..20df67e6 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -2603,12 +2603,13 @@ namespace VEPROMS.CSLA.Library public class Separator : vlnFormatItem { public Separator(XmlNode xmlNode) : base(xmlNode) { } - private LazyLoad _SeparatorLocation; - public int? SeparatorLocation + private LazyLoad _Location; + public int? Location { get { - return LazyLoad(ref _SeparatorLocation, "@SeparatorLocation"); + return LazyLoad(ref _Location, "@Location"); + //return LazyLoad(ref _SeparatorLocation, "@SeparatorLocation"); } } private VE_Font _Font; @@ -2810,6 +2811,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TabFormat, "@TabFormat"); } } + private LazyLoad _PrintTabFormat; + public string PrintTabFormat + { + get + { + return LazyLoad(ref _TabFormat, "@PrintTabFormat"); + } + } public override string GetPDDisplayName() { return string.Format("Index [{0}]",Index); } public override string GetPDDescription() @@ -3503,12 +3512,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SameRowAsParent, "@SameRowAsParent"); } } - private LazyLoad _CheckoffSameAsParent; - public bool CheckoffSameAsParent + private LazyLoad _CheckOffSameAsParent; + public bool CheckOffSameAsParent { get { - return LazyLoad(ref _CheckoffSameAsParent, "@CheckoffSameAsParent"); + return LazyLoad(ref _CheckOffSameAsParent, "@CheckOffSameAsParent"); } } private LazyLoad _AtLeastTwoDigits; @@ -3593,7 +3602,7 @@ namespace VEPROMS.CSLA.Library } public override string ToString() { - return string.Format("{0}", Type); + return string.Format("{0:00} - {1}", Index, Type); } } #endregion @@ -3775,12 +3784,20 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _BackColor, "StepLayoutData/@BackColor"); } } - private LazyLoad _STExtralines; - public int? STExtralines + //private LazyLoad _STExtralines; Replaced with STExtraSpace + //public int? STExtralines + //{ + // get + // { + // return LazyLoad(ref _STExtralines, "StepLayoutData/@STExtralines"); + // } + //} + private LazyLoad _STExtraSpace; + public int? STExtraSpace { get { - return LazyLoad(ref _STExtralines, "StepLayoutData/@STExtralines"); + return LazyLoad(ref _STExtraSpace, "StepLayoutData/@STExtraSpace"); } } private LazyLoad _STBoxindex; @@ -3933,12 +3950,12 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _IdentPrint, "TabData/@Ident"); } } - private LazyLoad _AltPrintTBIdent; - public string AltPrintTBIdent + private LazyLoad _IdentAltPrint; + public string IdentAltPrint { get { - return LazyLoad(ref _AltPrintTBIdent, "TabData/@AltPrintTBIdent"); + return LazyLoad(ref _IdentAltPrint, "TabData/@IdentAltPrint"); } } private LazyLoad _RNOIdentEdit; @@ -3978,7 +3995,8 @@ namespace VEPROMS.CSLA.Library { get { - return (_Font == null ? _Font = new VE_Font(base.XmlNode) : _Font); + XmlNode xn = vlnFormatDocument.LookupSingleStepNode(base.XmlNode, "TabData[Font]"); + return (_Font == null ? _Font = new VE_Font(xn) : _Font); } } }