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

B2020-120: For Calvert alarms, REFERENCE section not paginating correctly sometimes

Browse Source
This commit is contained in:
Kathy Ruffing 2020-08-28 10:42:13 +00:00
parent 227d154ad1
commit 2e34568a37
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/Volian.Print.Library/Pagination.cs
View File

@ -1289,6 +1289,8 @@ namespace Volian.Print.Library
} }
onNewPage = true; onNewPage = true;
float yTopNew = Math.Min(paraBreak.YTopMost, paraBreak.YVeryTop) - YTopMost; float yTopNew = Math.Min(paraBreak.YTopMost, paraBreak.YVeryTop) - YTopMost;
// B2020-120: for calvert alarms, consider the size of the condition response text/lines
if (paraBreak.HasCalvertMacro) yTopNew += (accountForCalvertAlarmConditionResponseFooter - SixLinesPerInch);
// B2017-161: unnecessary PageBreak for background documents: use the 'usedPageBreakOnStepList' flag when using the PageBreakOnStepList, don't adjust space on page to account // B2017-161: unnecessary PageBreak for background documents: use the 'usedPageBreakOnStepList' flag when using the PageBreakOnStepList, don't adjust space on page to account
// for continue message, if there is not one. // for continue message, if there is not one.
bool usedPageBreakOnStepList = false; bool usedPageBreakOnStepList = false;
@ -1650,6 +1652,8 @@ namespace Volian.Print.Library
// B2020-099 was breaking on last sub-step of previous RNO - Calvert Approved Procedures; Abnormal Procedures – Unit 2; AOP-2A; Section VII; Step 11.RNO.11.1.c // B2020-099 was breaking on last sub-step of previous RNO - Calvert Approved Procedures; Abnormal Procedures – Unit 2; AOP-2A; Section VII; Step 11.RNO.11.1.c
private vlnParagraph HasSecondRNOThatWillFit(float yStart, float yLowerLimit, float yUpperLimit, StepLevelList myList, int stepLevel, float yTop) private vlnParagraph HasSecondRNOThatWillFit(float yStart, float yLowerLimit, float yUpperLimit, StepLevelList myList, int stepLevel, float yTop)
{ {
// B2020-120: for calvert alarms/condition response table, don't run code for second rno
if (this.ChildrenAbove != null && this.ChildrenAbove.Count > 0) if (HasCalvertMacro) return this;
// note: "this" is the myPara from where this method is called // note: "this" is the myPara from where this method is called
if (!MyItemInfo.IsInRNO || MyItemInfo.GetMaxRNOLevels <= 1) // GetMaxRNOLevels will get the greatest (lowest) RNO level in the step if (!MyItemInfo.IsInRNO || MyItemInfo.GetMaxRNOLevels <= 1) // GetMaxRNOLevels will get the greatest (lowest) RNO level in the step
return this; // does not have second (more than one) RNO - break at the myPara return this; // does not have second (more than one) RNO - break at the myPara