From e5cba62b956e7f1032c39fce27bbfc9489d4fbe0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 8 Jun 2022 14:23:19 +0000 Subject: [PATCH] B2022-060 Change bars on second page not positioned correctly (Prairie Island) B2022-060 Change bars on second page not positioned correctly (Prairie Island) B2022-066 Alarm number not printing properly in page header (Prairie Island) --- PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 8 ++++++-- PROMS/Volian.Print.Library/vlnChangeBar.cs | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 13f67670..11f986ac 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -824,10 +824,13 @@ i = 0; private void DrawChangeBars(PdfContentByte cb) { float tmp = 0; + // B2022-060 Prairie Island Alarms, change bars on second page of Alarm Point would sometimes be printed to far down the page + // The TopMargin setting of the first page is different than the second page and needed to be passed in to ToPDF for change bars + float topMargin = (float)MySection.MyDocStyle.Layout.TopMargin; foreach (vlnChangeBar vcb in MyChangeBars) { // TODO: Pass in zeroes because topdf is inherited. - vcb.ToPdf(cb, 0, ref tmp, ref tmp); + vcb.ToPdf(cb, topMargin, ref tmp, ref tmp); } _MyChangeBars = new List(); } @@ -1896,7 +1899,8 @@ i = 0; } - if (token.Equals("{ PREDELIMEOPNUM}")) + // B2022-066 the "{PREDELIMEOPNUM}" token was not being processed because there was a space after the "{" + if (token.Equals("{PREDELIMEOPNUM}")) { // only use up to the first non-alphanumeric character of the procedur number // Prairie Island (NSP) Alarms use this token diff --git a/PROMS/Volian.Print.Library/vlnChangeBar.cs b/PROMS/Volian.Print.Library/vlnChangeBar.cs index 16c2360d..4c23968a 100644 --- a/PROMS/Volian.Print.Library/vlnChangeBar.cs +++ b/PROMS/Volian.Print.Library/vlnChangeBar.cs @@ -162,6 +162,8 @@ namespace Volian.Print.Library { float? topMost = null; cb.SaveState(); + // B2022-060 Prairie Island Alarms, change bars on second page of Alarm Point would sometimes be printed to far down the page + // The TopMargin setting of the first page is different than the second page and needed to be passed in // for bug fix B2015-159 // Ginna reported an instance where a change bar started printing inside the page header box // in their Abnornal procedures AP-SG.1 step 41.b RNO which continued onto the next page @@ -169,7 +171,7 @@ namespace Volian.Print.Library if (_MyParent is vlnParagraph) { vlnParagraph pgh = _MyParent as vlnParagraph; - topMost = cb.PdfWriter.PageSize.Height - (float)pgh.MyItemInfo.MyDocStyle.Layout.TopMargin; + topMost = cb.PdfWriter.PageSize.Height - yPageStart; } VlnSvgPageHelper _MyPageHelper = cb.PdfWriter.PageEvent as VlnSvgPageHelper; PdfLayer textLayer = _MyPageHelper == null ? null : _MyPageHelper.TextLayer;