Compare commits
8 Commits
e670b3776b
...
f0670905b3
Author | SHA1 | Date | |
---|---|---|---|
f0670905b3 | |||
e53cc2ab71 | |||
f02ca8bd86 | |||
27bbbdc9df | |||
bda5a54754 | |||
935e666b7f | |||
b1043cfec1 | |||
ad64675119 |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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)
|
||||
|
@ -1458,6 +1458,14 @@ namespace VEPROMS.CSLA.Library
|
||||
return LazyLoad(ref _NoBlankLastNoteCautionWarn, "@NoBlankLastNoteCautionWarn");
|
||||
}
|
||||
}
|
||||
private LazyLoad<bool> _NoteCautionCenterOneAllTypes; // F2023-126: Vogtle Alarms - center single line caution/note if more than one type exist off step
|
||||
public bool NoteCautionCenterOneAllTypes
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _NoteCautionCenterOneAllTypes, "@NoteCautionCenterOneAllTypes");
|
||||
}
|
||||
}
|
||||
private LazyLoad<bool> _ChkBoxToGeneratePointListText; // C2021-063 Barakah Alarm: check box to generate Alarm Point List Text
|
||||
public bool ChkBoxToGeneratePointListText
|
||||
{
|
||||
@ -3182,6 +3190,14 @@ namespace VEPROMS.CSLA.Library
|
||||
return LazyLoad(ref _WolfcreekCKLBackgndFormat, "@WolfcreekCKLBackgndFormat");
|
||||
}
|
||||
}
|
||||
private LazyLoad<bool> _Vogtle3and4BackgroundFormat;
|
||||
public bool Vogtle3and4BackgroundFormat
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _Vogtle3and4BackgroundFormat, "@Vogtle3and4BackgroundFormat");
|
||||
}
|
||||
}
|
||||
private LazyLoad<bool> _FortranFormatNumbers;
|
||||
public bool FortranFormatNumbers
|
||||
{
|
||||
@ -6611,6 +6627,14 @@ namespace VEPROMS.CSLA.Library
|
||||
return LazyLoad(ref _NoTrim, "TabData/@NoTrim");
|
||||
}
|
||||
}
|
||||
private LazyLoad<bool> _UseEntireSectionNum;
|
||||
public bool UseEntireSectionNum
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
@ -1046,8 +1046,9 @@ namespace Volian.Print.Library
|
||||
|
||||
// Calvert Alarms have a special case, center text if the next/previous is not the same type of caution or note.
|
||||
// Calvert Alarms have a note1 that is a warning. if a regular note preceeded it, this regular note was not centered.
|
||||
// F2023-126: Vogtle Alarms - center single line caution/note if more than one type exist off step, added the check for NoteCautionCenterOneAllTypes
|
||||
bool doAlign = false;
|
||||
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && (MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.IsNote1))
|
||||
if ((MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert || MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.NoteCautionCenterOneAllTypes) && (MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.IsNote1))
|
||||
{
|
||||
bool diffAsPrev = MyItemInfo.MyPrevious == null || (MyItemInfo.MyPrevious != null && MyItemInfo.MyContent.Type != MyItemInfo.MyPrevious.MyContent.Type);
|
||||
bool diffAsNext = MyItemInfo.NextItem == null || (MyItemInfo.NextItem != null && MyItemInfo.MyContent.Type != MyItemInfo.NextItem.MyContent.Type);
|
||||
@ -6233,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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user