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

B2019-120 A table in Byron procedure ELEC-1 printed off the bottom of the page. Logic now does a better job in calculating the space available on the page and if the step part being printed will fit.

Browse Source
This commit is contained in:
John Jenko 2019-08-30 12:25:34 +00:00
parent 995acf2e04
commit 6e06cbdf88
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2971,7 +2971,7 @@ namespace Volian.Print.Library
} }
private float OutputOtherPageSteps(PdfContentByte cb, float YTopMost, float yPageStart, float yTopMargin, float yBottomMargin) private float OutputOtherPageSteps(PdfContentByte cb, float YTopMost, float yPageStart, float yTopMargin, float yBottomMargin)
{ {
// B2019-115 Locate Bottom Continue Message below AER Table if necesssary - Initialize TableBottom to -1 // B2019-115 Locate Bottom Continue Message below AER Table if necessary - Initialize TableBottom to -1
TableBottom = -1; TableBottom = -1;
float retval = YTopMost; float retval = YTopMost;
// Find any items remaining in MyPageHelper.MyParagraphs that should be printed on this page. // Find any items remaining in MyPageHelper.MyParagraphs that should be printed on this page.
@ -2981,11 +2981,11 @@ namespace Volian.Print.Library
{ {
if (!vPara.Processed) if (!vPara.Processed)
{ {
if (vPara.MyItemInfo.IsTable && (vPara.YOffset <= YTopMost) && vPara.MyItemInfo.ActiveSection.ColumnMode > 0) if (vPara.MyItemInfo.IsTable && (vPara.YOffset <= YTopMost) && vPara.MyItemInfo.ActiveSection.ColumnMode > 0 && vPara.Height + yBottomMargin < yPageStart - vPara.YOffset) //B2019-120 Byron ELEC-1 step 3 second table was not printing on following page
{ {
if (vPara.MyItemInfo.ActiveSection.ColumnMode > 0) if (this.MyItemInfo.ItemID != vPara.MyItemInfo.ItemID)
{ {
// B2019-115 Locate Bottom Continue Message below AER Table if necesssary // B2019-115 Locate Bottom Continue Message below AER Table if necessary
_MyLog.WarnFormat("\r\n=-=-=> Table Print on First Page {0} {1} ColumnMode = {2}", vPara.MyItemInfo.ItemID, vPara.MyItemInfo.ShortPath, vPara.MyItemInfo.ActiveSection.ColumnMode); _MyLog.WarnFormat("\r\n=-=-=> Table Print on First Page {0} {1} ColumnMode = {2}", vPara.MyItemInfo.ItemID, vPara.MyItemInfo.ShortPath, vPara.MyItemInfo.ActiveSection.ColumnMode);
process.Add(vPara); process.Add(vPara);
// Console.WriteLine("Table YOffset {0} height {1} Bottom = {2} yPageStart = {3} Bottom {4}", vPara.YOffset, vPara.Height, vPara.YOffset + vPara.Height - yPageStart, yPageStart, this.YBottom); // Console.WriteLine("Table YOffset {0} height {1} Bottom = {2} yPageStart = {3} Bottom {4}", vPara.YOffset, vPara.Height, vPara.YOffset + vPara.Height - yPageStart, yPageStart, this.YBottom);
@ -3030,7 +3030,7 @@ namespace Volian.Print.Library
foreach (vlnParagraph vPara in process) foreach (vlnParagraph vPara in process)
{ {
vPara.ParagraphToPdf(cb, yPageStart, yTopMargin, yBottomMargin); vPara.ParagraphToPdf(cb, yPageStart, yTopMargin, yBottomMargin);
// B2019-115 Locate Bottom Continue Message below AER Table if necesssary // B2019-115 Locate Bottom Continue Message below AER Table if necessary
if(vPara.MyItemInfo.IsTable) if(vPara.MyItemInfo.IsTable)
{ {
if (TableBottom == -1) if (TableBottom == -1)
@ -6679,7 +6679,10 @@ namespace Volian.Print.Library
public int StepLevel public int StepLevel
{ {
get { return _StepLevel; } get { return _StepLevel; }
set { _StepLevel = value; } set {
//if (MyParagraph.MyItemInfo.InList(97960,84472,91010))
// Console.WriteLine("stop");
_StepLevel = value; }
} }
private vlnParagraph _MyParagraph; private vlnParagraph _MyParagraph;
public vlnParagraph MyParagraph public vlnParagraph MyParagraph