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

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.

Browse Source
This commit is contained in:
Kathy Ruffing 2017-05-30 15:26:23 +00:00
parent 1648de9f8d
commit d9eab8b1aa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PROMS/Volian.Print.Library/vlnParagraph.cs
View File

@ -532,10 +532,12 @@ namespace Volian.Print.Library
retval = DrawFigure(cb, yBottomMargin, yLocation, yPageStart, yTopMargin); retval = DrawFigure(cb, yBottomMargin, yLocation, yPageStart, yTopMargin);
else else
retval = DrawText(cb, ref yPageStart, yTopMargin, yBottomMargin, ref yLocation); retval = DrawText(cb, ref yPageStart, yTopMargin, yBottomMargin, ref yLocation);
if (MyItemInfo.IsInSupInfo) _yPageStartForSupInfo = retval;
} }
else if (MyItemInfo.IsRtfRaw) else if (MyItemInfo.IsRtfRaw)
{ {
retval = DrawRaw(cb, yBottomMargin, yLocation, yPageStart, yTopMargin); retval = DrawRaw(cb, yBottomMargin, yLocation, yPageStart, yTopMargin);
if (MyItemInfo.IsInSupInfo) _yPageStartForSupInfo = retval * .6f;
} }
else if (!MyItemInfo.IsStepSection else if (!MyItemInfo.IsStepSection
|| (ShowSectionTitles || (ShowSectionTitles
@ -558,6 +560,7 @@ namespace Volian.Print.Library
int profileDepth = ProfileTimer.Push(">>>> vlnParagraph.DrawDrid"); int profileDepth = ProfileTimer.Push(">>>> vlnParagraph.DrawDrid");
// RHM20150507 Include Footer // RHM20150507 Include Footer
retval = DrawGrid(cb, ref yPageStart, yTopMargin, yBottomMargin + (float)MyItemInfo.MyDocStyle.Layout.FooterLength, ref yLocation); // RHM20150429 - Table Scrunch 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); ProfileTimer.Pop(profileDepth);
} }
else else
@ -4636,8 +4639,10 @@ namespace Volian.Print.Library
float scale = itemInfo.IsRtfRaw ? 0.6f : 1.0f; float scale = itemInfo.IsRtfRaw ? 0.6f : 1.0f;
bool aerTableOrFigure = itemInfo.FormatStepData.Type.Contains("AER"); bool aerTableOrFigure = itemInfo.FormatStepData.Type.Contains("AER");
vlnParagraph hls1 = MyParent; 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; 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 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 xLowerLimit = (aerTableOrFigure && hls1.PartsLeft != null && hls1.PartsLeft.Count > 0) ? hls1.PartsLeft[0].XOffset : hls1.XOffset;
float xUpperLimit = 0; float xUpperLimit = 0;