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

missing box

Browse Source 
docstyle messages: {par} consistent with code
docstyle messages: {par} consistent with code & missing box
Handle par in endmessage
Allow for more end message text length
Handle asterisk hls draws when steps are compressed
For RNO separator, if aer column is further down on page than rno, print rno separator off of aer (was causing separator to print beyond margin)
This commit is contained in:
Kathy Ruffing
2015-03-16 13:54:18 +00:00
parent 06e71b1522
commit 086e73720c
15 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,6 +328,7 @@ namespace Volian.Print.Library
// increment the y offset if not doing the ComponentTableFormat
else if (!para.UseTemplateKeepOnCurLine(childItemInfo))
yoff = para.YBottomMost;
// para.YBottomMost += para.YBottomMostAdjust; // KBR for IP3 pagination: don't adjust YBottomost until after yoff is set.
if (box != null && childItemInfo.FormatStepData != null && childItemInfo.FormatStepData.BoxIt)
{
box.Height = yoff - box.YOffset - (1.1F * vlnPrintObject.SixLinesPerInch);
@@ -3305,12 +3306,17 @@ namespace Volian.Print.Library
MyItemInfo.MyHLS.RNOs != null && MyItemInfo.MyHLS.RNOs.Count > 0) ? 2 * SixLinesPerInch : 0;
vlnRNOSeparator myRnoSep = new vlnRNOSeparator(this, cb, tmpRnoSepStr, xsep, yoff+yadjSep, formatInfo, bottomChild == null ? true : bottomChild.MyItemInfo.HasChangeBar);
// TODO: May need to handle more than one RNO column for RNO Separator
if (rno.LastRNO.MyItemInfo.HasChangeBar == false && bottomChild != null && bottomChild.MyItemInfo.HasChangeBar)
if ((rno.LastRNO.MyItemInfo.HasChangeBar == false && bottomChild != null && bottomChild.MyItemInfo.HasChangeBar)
|| (bottomChild != null && bottomChild.YBottom > rno.LastRNO.YBottomMost))
bottomChild.PartsBelow.Add(myRnoSep);
else
rno.LastRNO.PartsBelow.Add(myRnoSep);
MyHighLevelParagraph.YBottomForBox = 0;
if (yadjSep>0) MyHighLevelParagraph.YBottomForBox = yoff; // if hlrno, box before sep
if (yadjSep > 0)
{
MyHighLevelParagraph.YBottomForBox = yoff; // if hlrno, box before sep
//YBottomMostAdjust = SixLinesPerInch; // KBR for IP3 pagination
}
yoff += (myRnoSep.Height + SixLinesPerInch);
}
YBottomMost = yoff;
@@ -4025,6 +4031,12 @@ namespace Volian.Print.Library
get { return _YBottomMost; }
set { _YBottomMost = value; }
}
//protected float _YBottomMostAdjust = 0; // KBR for IP3 pagination
//public float YBottomMostAdjust
//{
// get { return _YBottomMostAdjust; }
// set { _YBottomMostAdjust = value; }
//}
protected float _YTopMost; // Top of the paragraph including the children
public float YTopMost
{