Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge pull request 'Development' (#177) from Development into master

Browse Source 
Merging B2023-115 and F2023-150 from development into master.  No testing required since formats are under development.
This commit is contained in:
Devin Jankowski 2023-12-06 09:08:18 -05:00
commit 3084bf3982
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/VEGP1all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGP2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/fmtall/VEGPAlrall.xml
View File

Binary file not shown.

24
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -2823,6 +2823,30 @@ namespace Volian.Print.Library
ItemInfo parentStep = MyItemInfo.MyHLS; // get the high level step ItemInfo parentStep = MyItemInfo.MyHLS; // get the high level step
myMsg = string.Format(myMsg, parentStep.CombinedTab, parentStep.DisplayTextKeepSpecialChars); myMsg = string.Format(myMsg, parentStep.CombinedTab, parentStep.DisplayTextKeepSpecialChars);
} }
if ((docstyle.Continue.Top.HLS ?? 0) == 4) // B2023-115 Top continue message for Vogtle Alarms
{
// Vogtle Alarms: Their alarms are set up differently than standard procedures - the HLS in Vogtle
// alarms is a section in other procedures. The top continue message is shown when a break occurs between
// first level sub-steps '(continued)' with no step number as part of message' within the first level sub-step
// only if it is sequential (which is like a HLS in standard procedures) and the continue message
// has the first level sub-step's tab. There should be NO continue message if the break occurs at the HLS.
ItemInfo cur = MyItemInfo;
if (!(cur.IsCaution || cur.IsNote || cur.IsHigh))
while (!cur.MyParent.IsHigh) cur = cur.MyParent; // get to the first level substep to get its tab
myMsg = docstyle.Continue.Top.Message;
// if within first level sequential, add on the sequential's number:
if (!cur.IsHigh && cur.IsSequential && MyItemInfo.MyParent.MyParent.IsHigh)
{
ItemInfo parentStep = MyItemInfo.MyParent;
myMsg = MyItemInfo.IsHigh ? myMsg : parentStep.CombinedTab + ". " + myMsg;
}
// don't put a message out for HLS, note that the page start is decremented above so need to add that amount back on
if (MyItemInfo.IsHigh)
{
myMsg = "";
yPageStart += 2 * SixLinesPerInch;
}
}
// B2021-138: Top continue message for Barakah Single column New (2021) format was incorrect for some lower // B2021-138: Top continue message for Barakah Single column New (2021) format was incorrect for some lower
// sub-steps. // sub-steps.
if ((docstyle.Continue.Top.HLS ?? 0) == 6) if ((docstyle.Continue.Top.HLS ?? 0) == 6)