Compare commits

..

No commits in common. "eb00324edf281785de7dc2a6bb255bd91481ecb8" and "b1043cfec18b63d82803462f54ab5bb14acfd7f7" have entirely different histories.

7 changed files with 2 additions and 20 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -4972,8 +4972,7 @@ namespace VEPROMS.CSLA.Library
// Otherwise, just return the section tab. // Otherwise, just return the section tab.
// Before checking for anything, if the DisplayNumber starts with 'ATTACHMENT ', don't use that in the Section // Before checking for anything, if the DisplayNumber starts with 'ATTACHMENT ', don't use that in the Section
// prefix for the tabstring. // prefix for the tabstring.
// 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 ") ? ActiveSection.DisplayNumber.Substring(11) : ActiveSection.DisplayNumber;
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 Match m = Regex.Match(attNum, @"[a-zA-Z]"); // for alpha, use non-touched displaynumber
int indx = -1; int indx = -1;
if (m.Success) if (m.Success)

View File

@ -3190,14 +3190,6 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _WolfcreekCKLBackgndFormat, "@WolfcreekCKLBackgndFormat"); return LazyLoad(ref _WolfcreekCKLBackgndFormat, "@WolfcreekCKLBackgndFormat");
} }
} }
private LazyLoad<bool> _Vogtle3and4BackgroundFormat;
public bool Vogtle3and4BackgroundFormat
{
get
{
return LazyLoad(ref _Vogtle3and4BackgroundFormat, "@Vogtle3and4BackgroundFormat");
}
}
private LazyLoad<bool> _FortranFormatNumbers; private LazyLoad<bool> _FortranFormatNumbers;
public bool FortranFormatNumbers public bool FortranFormatNumbers
{ {
@ -6627,14 +6619,6 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _NoTrim, "TabData/@NoTrim"); return LazyLoad(ref _NoTrim, "TabData/@NoTrim");
} }
} }
private LazyLoad<bool> _UseEntireSectionNum;
public bool UseEntireSectionNum
{
get
{
return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum");
}
}
} }
#endregion #endregion

View File

@ -6234,8 +6234,7 @@ namespace Volian.Print.Library
if (!itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm || !UseTemplateWidthOrXOff(itemInfo.MyParent)) if (!itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm || !UseTemplateWidthOrXOff(itemInfo.MyParent))
{ {
// B2018-146 Adjust the width to match the HLS Right Margin. // B2018-146 Adjust the width to match the HLS Right Margin.
// 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())
if (itemInfo.IsBackgroundStepOrChild() || itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.Vogtle3and4BackgroundFormat)
Width = this.MyHighLevelParagraph.Width + this.MyHighLevelParagraph.XOffset - this.XOffset; Width = this.MyHighLevelParagraph.Width + this.MyHighLevelParagraph.XOffset - this.XOffset;
else else
Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin - delta; Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin - delta;