From d9eab8b1aa69d6e87cdf00787e328259408fe63a Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 30 May 2017 15:26:23 +0000 Subject: [PATCH] B2017-100: Tables, figures and equations in Sup Info column do not print properly, text below overwrites them. Also, the x-offset was adjusted to center below sup info steps. --- PROMS/Volian.Print.Library/vlnParagraph.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 8a56f2d0..35e1df00 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -532,10 +532,12 @@ namespace Volian.Print.Library retval = DrawFigure(cb, yBottomMargin, yLocation, yPageStart, yTopMargin); else retval = DrawText(cb, ref yPageStart, yTopMargin, yBottomMargin, ref yLocation); + if (MyItemInfo.IsInSupInfo) _yPageStartForSupInfo = retval; } else if (MyItemInfo.IsRtfRaw) { retval = DrawRaw(cb, yBottomMargin, yLocation, yPageStart, yTopMargin); + if (MyItemInfo.IsInSupInfo) _yPageStartForSupInfo = retval * .6f; } else if (!MyItemInfo.IsStepSection || (ShowSectionTitles @@ -558,6 +560,7 @@ namespace Volian.Print.Library int profileDepth = ProfileTimer.Push(">>>> vlnParagraph.DrawDrid"); // RHM20150507 Include Footer retval = DrawGrid(cb, ref yPageStart, yTopMargin, yBottomMargin + (float)MyItemInfo.MyDocStyle.Layout.FooterLength, ref yLocation); // RHM20150429 - Table Scrunch + if (MyItemInfo.IsInSupInfo) _yPageStartForSupInfo = (float)MyPageHelper.BottomContent - SixLinesPerInch; ProfileTimer.Pop(profileDepth); } else @@ -4636,8 +4639,10 @@ namespace Volian.Print.Library float scale = itemInfo.IsRtfRaw ? 0.6f : 1.0f; bool aerTableOrFigure = itemInfo.FormatStepData.Type.Contains("AER"); vlnParagraph hls1 = MyParent; - if (!formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm) + if (!formatInfo.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && !itemInfo.IsInSupInfo) while (hls1.MyParent != null && !hls1.MyItemInfo.IsHigh) hls1 = hls1.MyParent; + else if (itemInfo.IsInSupInfo) + while (hls1.MyParent != null && !hls1.MyItemInfo.IsSupInfoPart) hls1 = hls1.MyParent; float colR = float.Parse(formatInfo.MyStepSectionLayoutData.ColRTable.Split(",".ToCharArray())[itemInfo.ColumnMode]); float xLowerLimit = (aerTableOrFigure && hls1.PartsLeft != null && hls1.PartsLeft.Count > 0) ? hls1.PartsLeft[0].XOffset : hls1.XOffset; float xUpperLimit = 0;