From 65bfcdb9b8387164c3a45e6d7bee13f92ecf6498 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 29 May 2015 23:08:10 +0000 Subject: [PATCH] Adjust the XOffset for a table before determining if the table will overlap the RNO column. --- PROMS/Volian.Print.Library/vlnParagraph.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 948f06f6..8dc60402 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -3022,6 +3022,8 @@ namespace Volian.Print.Library MyGrid = new vlnTable(MyFlexGrid, cb); Height = MyGrid.Height; Width = MyGrid.Width; + // Adjust the XOffset before determining if the table will overlap the RNO column RHM 20150529 + CalculateXOffsetGridOrFigure(itemInfo, maxRNO, formatInfo); if (!itemInfo.IsInRNO && yoffRightParent > yoff && itemInfo.FormatStepData.Type.Contains("AER")) { @@ -3035,17 +3037,14 @@ namespace Volian.Print.Library YOffset = yoff; } } - // if the table does not have a border, only move down one line: float yoffForBorder = 2 * SixLinesPerInch; if (MyFlexGrid.BorderStyle == C1.Win.C1FlexGrid.Util.BaseControls.BorderStyleEnum.None && !MyFlexGrid.TopRowHasBorder()) yoffForBorder -= SixLinesPerInch; - //yForCheckoff = yoff + Height - SixLinesPerInch; if (dropCheckoff) yForCheckoff += Height - SixLinesPerInch; // place checkoff on last row of text yoff += (Height + yoffForBorder); //(2 * SixLinesPerInch)); - CalculateXOffsetGridOrFigure(itemInfo, maxRNO, formatInfo); yoff = (float)Math.Ceiling(yoff); ProfileTimer.Pop(profileDepth1); } @@ -3381,7 +3380,7 @@ namespace Volian.Print.Library else // AER or RNO Table if (loadChildren) yoff = ChildrenBelow.Add(cb, itemInfo.Tables, XOffset, yoff + yoffadj, yOffRight + yoffadj, rnoLevel, maxRNO, formatInfo); - } + } yOffRight = Math.Max(yOffRight, yoffLeft); // Look for the meta section case where the 'Editable' flag is set to 'N', which means that // these steps should not be printed: