FNP: Fixes for page breaks/yoffset for component list sections & overlap bottom message & text

Fix null reference when migrating FNP table
This commit is contained in:
2013-11-20 13:28:46 +00:00
parent 1415128986
commit fd49699ee0
2 changed files with 10 additions and 2 deletions

View File

@@ -28,6 +28,10 @@ namespace Volian.Print.Library
/// </returns>
private int Paginate(float yLocation, float yTopMargin, float yBottomMargin)
{
// Check if paginate on a separate section, if within a section. Top level section pagination happens in PromsPrinter
if (MyItemInfo.IsSection && MyParent != null && MyParent.MyItemInfo.IsSection && (MyItemInfo as SectionInfo).IsSeparatePagination())
return 1;
float yPageSize = yTopMargin - yBottomMargin;
// TODO: This does not account for a long step as the last step that would exceed more than one page and
@@ -358,7 +362,11 @@ namespace Volian.Print.Library
switch (docstyle.Continue.Bottom.Location)
{
case E_ContBottomLoc.BottomOfPage: // place continue message at bottom of page
myBottomMsgSpace = 0;
// The following format flag was added for FNP, without the flag (which stops the reset of BottomMsgSpace)
// a number of FNP procedures had overwritten steps/bottom continue message. An example can be
// found in FNP = SAMGS;FNP-1-SACRG-2, step 1.
if (!docstyle.Continue.Bottom.NoOverrideSpace)
myBottomMsgSpace = 0;
break;
}
string myTopMsg = docstyle.Continue.Top.Message;