Compare commits
4 Commits
F2026-001_
...
F2026-002_
| Author | SHA1 | Date | |
|---|---|---|---|
| c6eeb2107a | |||
| 70fd037161 | |||
| ed4469bd5f | |||
| 4273d72b9d |
Binary file not shown.
@@ -2098,6 +2098,15 @@ namespace VEPROMS.CSLA.Library
|
||||
{
|
||||
string resstr = rtnstr.Substring(0, indx);
|
||||
int endHsp = rtnstr.IndexOf(")", indx);
|
||||
|
||||
//B2026 - 002 handle if parens inside a HSP
|
||||
int startpos = indx + 5;
|
||||
while (rtnstr.Substring(startpos, endHsp - startpos).Contains("("))
|
||||
{
|
||||
startpos = rtnstr.IndexOf("(", startpos + 1, endHsp - startpos) + 1;
|
||||
endHsp = rtnstr.IndexOf(")", endHsp + 1);
|
||||
}
|
||||
|
||||
string tmpstr = rtnstr.Substring(indx + 5, endHsp - indx - 5);
|
||||
|
||||
// B2017-012 Don't convert space to hard spaces for XY Plots.
|
||||
|
||||
@@ -1148,6 +1148,15 @@ namespace VEPROMS.CSLA.Library
|
||||
}
|
||||
}
|
||||
|
||||
private LazyLoad<bool> _DontIncludeRNOTabIfHasAERParent;
|
||||
public bool DontIncludeRNOTabIfHasAERParent // F2026-002: Vogtle Units 3&4 Top Continue Message.
|
||||
{
|
||||
get
|
||||
{
|
||||
return LazyLoad(ref _DontIncludeRNOTabIfHasAERParent, "@DontIncludeRNOTabIfHasAERParent");
|
||||
}
|
||||
}
|
||||
|
||||
private LazyLoad<string> _Message;
|
||||
[Category("Continue Msg")]
|
||||
[DisplayName("Top Continue Msg")]
|
||||
|
||||
@@ -2819,6 +2819,9 @@ namespace Volian.Print.Library
|
||||
{
|
||||
// F2020-023: tab includes parent tab and if caution/note don't use its parent, go up another level
|
||||
string noBullet = MyItemInfo.IsCautionOrNotePart ? MyItemInfo.MyParent.MyParent.CombinedTab : MyItemInfo.MyParent.CombinedTab;
|
||||
// F2026-002 Vogtle Units 3&4, don't include the RNO sub-step tab if the parent is an AER sub-step
|
||||
if (docstyle.Continue.Top.DontIncludeRNOTabIfHasAERParent && MyItemInfo.MyParent.IsRNOPart && !MyItemInfo.MyParent.MyParent.IsRNOPart)
|
||||
noBullet = MyItemInfo.MyParent.MyParent.CombinedTab;
|
||||
// C2021-024: WCN1 if bullet exists in combined tab, stop right before bullet.
|
||||
// B2021-085 & 087: crash if noBullet was null. Also, if null, see if text in parent. if no text, replace the
|
||||
// "%s." with noBullet (null) which won't put out just a '.' as step number.
|
||||
|
||||
Reference in New Issue
Block a user