From 1e4c42a9f5033e3eb7737155db4bf25d65d23ea3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 18 Nov 2020 17:20:36 +0000 Subject: [PATCH] =?UTF-8?q?B2020-151=20=E2=80=93=20Calvert=20pagination=20?= =?UTF-8?q?fix.=20Keep=20OR=20substep=20together.=20=20Working=20Draft=20f?= =?UTF-8?q?older,=20:Unit=201=20Operating=20Procedures,=20OP-3,=20section?= =?UTF-8?q?=206.1,=20step=20A.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Print.Library/vlnParagraph.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index a4ec9393..552ec4f2 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -6689,8 +6689,10 @@ namespace Volian.Print.Library // using a negative for yLocation so that its in descending order: // B2020-112: Make various adjustments to location if there are format flags used // B2020-116: Only make the 112 change for Calvert + // B2020-151: check for SpecialCaseCalvertPagination flag instead of SpecialCase Calvert flag so only EOPs/AOPs are affected float adjust = 0; - if (para.MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) adjust = para.YVeryTop - para.YTop; + if (para.MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertPagination) + adjust = para.YVeryTop - para.YTop; //if (para.MyItemInfo.MyParent.IsHigh && (para.ChildrenAbove == null || para.ChildrenAbove.Count == 0)) //{ // //Console.WriteLine("Adjust Add extra Line (flag) = '{0}'", para); @@ -6707,7 +6709,7 @@ namespace Volian.Print.Library //else if (para.MyParent.AdjustForMatchUpRNO != 0 && (para.MyParent.ChildrenAbove != null && para.MyParent.ChildrenAbove.Count > 0) // && para.MyParent.ChildrenAbove[0] == para) // adjust -= para.MyParent.AdjustForMatchUpRNO; - + if (!this[stepLevel].ContainsKey(-(yLocation + adjust))) this[stepLevel].Add(-(yLocation + adjust), para); }