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

Fix table location in y direction if off aer substep where HLS has long RNO

Browse Source
This commit is contained in:
Kathy Ruffing 2013-12-18 16:43:27 +00:00
parent 65dd986027
commit 1510f4e3e9
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1641,6 +1641,20 @@ 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;
if (!itemInfo.IsInRNO && yoffRightParent > yoff && itemInfo.FormatStepData.Type.Contains("AER"))
{
// is the width of this table going to cause the table to overlap the RNO
vlnParagraph parRno = FindParentRNO();
float xparRno = parRno.XOffset;
if (parRno.MyTab != null) xparRno = parRno.MyTab.XOffset;
if (XOffset + Width > xparRno)
{
yoff = yoffRightParent;
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())
@ -1860,6 +1874,7 @@ namespace Volian.Print.Library
yoffadj = -SixLinesPerInch; yoffadj = -SixLinesPerInch;
} }
if (yOffRight < yoffRightParent) yOffRight = yoffRightParent;
bool rightLonger = yOffRight > yoff; bool rightLonger = yOffRight > yoff;
if (!aerTableOrFigure && itemInfo.RNOLevel == 0) // Centered Table if (!aerTableOrFigure && itemInfo.RNOLevel == 0) // Centered Table
yoff = ChildrenBelow.Add(cb, itemInfo.Tables, XOffset, rightLonger ? yOffRight : yoff + yoffadj, yOffRight + yoffadj, rnoLevel, maxRNO, formatInfo); yoff = ChildrenBelow.Add(cb, itemInfo.Tables, XOffset, rightLonger ? yOffRight : yoff + yoffadj, yOffRight + yoffadj, rnoLevel, maxRNO, formatInfo);
@ -1911,6 +1926,12 @@ namespace Volian.Print.Library
if (savCheckListBottomMost != 0) YBottomMost = Math.Max(savCheckListBottomMost, YBottomMost); if (savCheckListBottomMost != 0) YBottomMost = Math.Max(savCheckListBottomMost, YBottomMost);
} }
private vlnParagraph FindParentRNO()
{
if (ChildrenRight != null && ChildrenRight.Count > 0) return ChildrenRight[0];
return MyParent.FindParentRNO();
}
private string GetMacroName(string str) private string GetMacroName(string str)
{ {
int mindx = str.IndexOf(@"{!"); int mindx = str.IndexOf(@"{!");