diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 7b39ec2d..4e929c4b 100644 Binary files a/PROMS/Formats/fmtall/VEGPAlrall.xml and b/PROMS/Formats/fmtall/VEGPAlrall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 2e1c10b3..e60327aa 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckStpsall.xml and b/PROMS/Formats/fmtall/VEGPBckStpsall.xml differ diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index 396b8ea6..00010106 100644 Binary files a/PROMS/Formats/fmtall/VEGPBckall.xml and b/PROMS/Formats/fmtall/VEGPBckall.xml differ diff --git a/PROMS/Formats/genmacall/VEGPBck.svg b/PROMS/Formats/genmacall/VEGPBck.svg index f81f5b07..15ffe7db 100644 Binary files a/PROMS/Formats/genmacall/VEGPBck.svg and b/PROMS/Formats/genmacall/VEGPBck.svg differ diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 110e2b15..d27ac719 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4972,7 +4972,8 @@ namespace VEPROMS.CSLA.Library // Otherwise, just return the section tab. // Before checking for anything, if the DisplayNumber starts with 'ATTACHMENT ', don't use that in the Section // prefix for the tabstring. - string attNum = ActiveSection.DisplayNumber.ToUpper().StartsWith("ATTACHMENT ") ? ActiveSection.DisplayNumber.Substring(11) : ActiveSection.DisplayNumber; + // F2023-112 - added flag to use entire section number in the step tab - Vogtle 3&4 Background format (VEGPBckStp) + string attNum = (ActiveSection.DisplayNumber.ToUpper().StartsWith("ATTACHMENT ") && !FormatStepData.TabData.UseEntireSectionNum) ? ActiveSection.DisplayNumber.Substring(11) : ActiveSection.DisplayNumber; Match m = Regex.Match(attNum, @"[a-zA-Z]"); // for alpha, use non-touched displaynumber int indx = -1; if (m.Success) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 00e494fb..250a4367 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -3190,6 +3190,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _WolfcreekCKLBackgndFormat, "@WolfcreekCKLBackgndFormat"); } } + private LazyLoad _Vogtle3and4BackgroundFormat; + public bool Vogtle3and4BackgroundFormat + { + get + { + return LazyLoad(ref _Vogtle3and4BackgroundFormat, "@Vogtle3and4BackgroundFormat"); + } + } private LazyLoad _FortranFormatNumbers; public bool FortranFormatNumbers { @@ -6619,6 +6627,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoTrim, "TabData/@NoTrim"); } } + private LazyLoad _UseEntireSectionNum; + public bool UseEntireSectionNum + { + get + { + return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum"); + } + } } #endregion diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index d39c6d61..8e12335e 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -6234,7 +6234,8 @@ namespace Volian.Print.Library if (!itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm || !UseTemplateWidthOrXOff(itemInfo.MyParent)) { // B2018-146 Adjust the width to match the HLS Right Margin. - if (itemInfo.IsBackgroundStepOrChild()) + // F2023-112 added format flag for Vogtle Units 3 & 4 backgrounds. This allows use of override width on AND and List sub-step types + if (itemInfo.IsBackgroundStepOrChild() || itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.Vogtle3and4BackgroundFormat) Width = this.MyHighLevelParagraph.Width + this.MyHighLevelParagraph.XOffset - this.XOffset; else Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin - delta;