B2020-151 – Calvert pagination fix. Keep OR substep together. Working Draft folder, :Unit 1 Operating Procedures, OP-3, section 6.1, step A.7

This commit is contained in:
John Jenko 2020-11-18 17:20:36 +00:00
parent 76b5ba1816
commit 1e4c42a9f5

View File

@ -6689,8 +6689,10 @@ namespace Volian.Print.Library
// using a negative for yLocation so that its in descending order: // 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-112: Make various adjustments to location if there are format flags used
// B2020-116: Only make the 112 change for Calvert // 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; 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)) //if (para.MyItemInfo.MyParent.IsHigh && (para.ChildrenAbove == null || para.ChildrenAbove.Count == 0))
//{ //{
// //Console.WriteLine("Adjust Add extra Line (flag) = '{0}'", para); // //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) //else if (para.MyParent.AdjustForMatchUpRNO != 0 && (para.MyParent.ChildrenAbove != null && para.MyParent.ChildrenAbove.Count > 0)
// && para.MyParent.ChildrenAbove[0] == para) // && para.MyParent.ChildrenAbove[0] == para)
// adjust -= para.MyParent.AdjustForMatchUpRNO; // adjust -= para.MyParent.AdjustForMatchUpRNO;
if (!this[stepLevel].ContainsKey(-(yLocation + adjust))) if (!this[stepLevel].ContainsKey(-(yLocation + adjust)))
this[stepLevel].Add(-(yLocation + adjust), para); this[stepLevel].Add(-(yLocation + adjust), para);
} }