From 4324fd93ae7ee0e37e232dcf9095e1503f681750 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 1 Jun 2017 12:26:33 +0000 Subject: [PATCH] B2017-103: Bottom continue message location adjustment B2017-103: Bottom continue message location adjustment using format value --- PROMS/Formats/fmtall/RGESAM1all.xml | Bin 45932 -> 46002 bytes .../VEPROMS.CSLA.Library/Format/DocStyles.cs | 9 +++++++++ PROMS/Volian.Print.Library/PromsPrinter.cs | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/RGESAM1all.xml b/PROMS/Formats/fmtall/RGESAM1all.xml index e5becbb815e3dc6dc84839edeb4b8dbb3ec2d40c..3b5c702974ccde158bcd0ee167eda5f1df25a658 100644 GIT binary patch delta 133 zcmaF!jA_$zrVVpCMSU3Z8IlpQ97?dUpPHf&R*Y$->5JP&h;yUrk zbu&yRKj^fZ{BFj-$$H%yllel-Hh-8T$2?hTp#rNJ&;*OkhSO}Ba2oEqdDDztQUJ&l BC@25` delta 69 zcmdn=oaxOorVVpCCwJrsO+GfmX!EyDBX$^P^0!XA$tE-ZZ9XumhIz8XTsdYl2D8bD Ta~(G?nD&nmq-yiA8E>Qj!bBm# diff --git a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs index 3489ca02..36bcdc6a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs @@ -836,6 +836,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoOverrideSpace, "@NoOverrideSpace"); } } + private LazyLoad _LocAdj; + public int? LocAdj + { + get + { + + return LazyLoad(ref _LocAdj, "@LocAdj"); + } + } #endregion #region Message private LazyLoad _Message; diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 4c468b0e..e2f9cdab 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -1620,7 +1620,13 @@ namespace Volian.Print.Library float yTopMargin = _PointsPerPage - (float)myItemInfo.MyDocStyle.Layout.TopMargin; yTopMargin -= _MyHelper.AdjustTopMarginForMultiLinePageListItems; // the following line was modified to comment out the - 2 * SixLinesPerInch. this fixed a pagination problem with WCN EMG E-3. - float yBottomMargin = Math.Max(0, yTopMargin - (float)myItemInfo.MyDocStyle.Layout.PageLength); // - 2 * vlnPrintObject.SixLinesPerInch); + // The change mentioned above caused the bottom message to print without a line separating it from step text (if the text was long + // enough to go to the bottom of page). A fix for this problem, B2017-103, is to use a format variable to define + // how many lines will go above the continue message. It was done this way so that it fixes the format/data that the problem + // was found in, i.e. Ginna Rev2 SAMG, SAG-3 step 7. This change won't affect other plants/formats but if the problem occurs + // the format value can be used to adjust the location of bottom message. However, this could adversely affect pagination and + // each plant/format needs to be done on a case by base basis. + float yBottomMargin = Math.Max(0, yTopMargin - (float)myItemInfo.MyDocStyle.Layout.PageLength - (myItemInfo.MyDocStyle.Continue.Bottom.LocAdj==null?0:(int)myItemInfo.MyDocStyle.Continue.Bottom.LocAdj)); vlnParagraph.PathPrefix = myItemInfo.Path; //Rtf2Pdf.PdfDebug = true; Rtf2Pdf.Offset = new PointF(0, 2.5F);