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

Adjust the XOffset for a table before determining if the table will overlap the RNO column.

Browse Source
This commit is contained in:
Rich 2015-05-29 23:08:10 +00:00
parent 4f16b9ca67
commit 65bfcdb9b8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3022,6 +3022,8 @@ namespace Volian.Print.Library
MyGrid = new vlnTable(MyFlexGrid, cb); MyGrid = new vlnTable(MyFlexGrid, cb);
Height = MyGrid.Height; Height = MyGrid.Height;
Width = MyGrid.Width; 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")) if (!itemInfo.IsInRNO && yoffRightParent > yoff && itemInfo.FormatStepData.Type.Contains("AER"))
{ {
@ -3035,17 +3037,14 @@ namespace Volian.Print.Library
YOffset = yoff; YOffset = yoff;
} }
} }
// if the table does not have a border, only move down one line: // if the table does not have a border, only move down one line:
float yoffForBorder = 2 * SixLinesPerInch; float yoffForBorder = 2 * SixLinesPerInch;
if (MyFlexGrid.BorderStyle == C1.Win.C1FlexGrid.Util.BaseControls.BorderStyleEnum.None && !MyFlexGrid.TopRowHasBorder()) if (MyFlexGrid.BorderStyle == C1.Win.C1FlexGrid.Util.BaseControls.BorderStyleEnum.None && !MyFlexGrid.TopRowHasBorder())
yoffForBorder -= SixLinesPerInch; yoffForBorder -= SixLinesPerInch;
//yForCheckoff = yoff + Height - SixLinesPerInch; //yForCheckoff = yoff + Height - SixLinesPerInch;
if (dropCheckoff) if (dropCheckoff)
yForCheckoff += Height - SixLinesPerInch; // place checkoff on last row of text yForCheckoff += Height - SixLinesPerInch; // place checkoff on last row of text
yoff += (Height + yoffForBorder); //(2 * SixLinesPerInch)); yoff += (Height + yoffForBorder); //(2 * SixLinesPerInch));
CalculateXOffsetGridOrFigure(itemInfo, maxRNO, formatInfo);
yoff = (float)Math.Ceiling(yoff); yoff = (float)Math.Ceiling(yoff);
ProfileTimer.Pop(profileDepth1); ProfileTimer.Pop(profileDepth1);
} }
@ -3381,7 +3380,7 @@ namespace Volian.Print.Library
else // AER or RNO Table else // AER or RNO Table
if (loadChildren) if (loadChildren)
yoff = ChildrenBelow.Add(cb, itemInfo.Tables, XOffset, yoff + yoffadj, yOffRight + yoffadj, rnoLevel, maxRNO, formatInfo); yoff = ChildrenBelow.Add(cb, itemInfo.Tables, XOffset, yoff + yoffadj, yOffRight + yoffadj, rnoLevel, maxRNO, formatInfo);
} }
yOffRight = Math.Max(yOffRight, yoffLeft); yOffRight = Math.Max(yOffRight, yoffLeft);
// Look for the meta section case where the 'Editable' flag is set to 'N', which means that // Look for the meta section case where the 'Editable' flag is set to 'N', which means that
// these steps should not be printed: // these steps should not be printed: