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

B2022-060 Change bars on second page not positioned correctly (Prairie Island)

Browse Source 
B2022-060 Change bars on second page not positioned correctly (Prairie Island)
B2022-066 Alarm number not printing properly in page header (Prairie Island)
This commit is contained in:
John Jenko 2022-06-08 14:23:19 +00:00
parent f1b18221ce
commit e5cba62b95
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -824,10 +824,13 @@ i = 0;
private void DrawChangeBars(PdfContentByte cb) private void DrawChangeBars(PdfContentByte cb)
{ {
float tmp = 0; 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) foreach (vlnChangeBar vcb in MyChangeBars)
{ {
// TODO: Pass in zeroes because topdf is inherited. // 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<vlnChangeBar>(); _MyChangeBars = new List<vlnChangeBar>();
} }
@ -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 // only use up to the first non-alphanumeric character of the procedur number
// Prairie Island (NSP) Alarms use this token // Prairie Island (NSP) Alarms use this token

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

@ -162,6 +162,8 @@ namespace Volian.Print.Library
{ {
float? topMost = null; float? topMost = null;
cb.SaveState(); 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 // for bug fix B2015-159
// Ginna reported an instance where a change bar started printing inside the page header box // 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 // 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) if (_MyParent is vlnParagraph)
{ {
vlnParagraph pgh = _MyParent as 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; VlnSvgPageHelper _MyPageHelper = cb.PdfWriter.PageEvent as VlnSvgPageHelper;
PdfLayer textLayer = _MyPageHelper == null ? null : _MyPageHelper.TextLayer; PdfLayer textLayer = _MyPageHelper == null ? null : _MyPageHelper.TextLayer;