diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 1678fc9d..d2a28446 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1869,7 +1869,7 @@ namespace Volian.Print.Library if (myMsg.Contains("%-12s")) myMsg = myMsg.Replace("%-12s", MyItemInfo.MyProcedure.DisplayNumber.PadRight(12)); float xpos = 0; - if (yTopMargin-docstyle.Layout.PageLength>=msg_yLocation) _MyLog.WarnFormat("End Message LOW on page: {0}, {1}, {2}, Page {3}",msg_yLocation, MyItemInfo.ItemID, MyItemInfo.ShortPath, MyPageHelper.CurrentPageNumber+1); + if (yTopMargin-docstyle.Layout.PageLength>=msg_yLocation && docstyle.End.Message != null && docstyle.End.Message != "" && docstyle.End.Flag<=2) _MyLog.WarnFormat("End Message LOW on page: {0}, {1}, {2}, Page {3}",msg_yLocation, MyItemInfo.ItemID, MyItemInfo.ShortPath, MyPageHelper.CurrentPageNumber+1); if ((docstyle.End.Margin ?? 0) != 0) { xpos = (float)docstyle.Layout.LeftMargin + (float)docstyle.End.Margin; @@ -2414,13 +2414,19 @@ namespace Volian.Print.Library vlnParagraphs process = new vlnParagraphs(null); foreach (vlnParagraph vPara in MyPageHelper.MyParagraphs.Values) { - if (vPara.MyItemInfo.InList(3351)) Console.WriteLine("here"); - //if (!vPara.Processed && ((vPara.YOffset + vPara.Height) < YTopMost)) if (!vPara.Processed && ((vPara.YOffset + vPara.Height) < YTopMost)) - if (this.MyItemInfo.ItemID != vPara.MyItemInfo.ItemID) // RHM20150507 Table Scrunch + if (this.MyItemInfo.ItemID != vPara.MyItemInfo.ItemID) // 20150701 Complicated RNO change process.Add(vPara); + else // 20150701 Complicated RNO change + _MyLog.WarnFormat("Less Than: Step Could Have Fit {0}, {1}", MyItemInfo.ItemID, MyItemInfo.ShortPath); + else if (!vPara.Processed && ((vPara.YOffset + vPara.Height) == YTopMost)) + if (this.MyItemInfo.ItemID != vPara.MyItemInfo.ItemID) // RHM20150507 Table Scrunch + { + process.Add(vPara); + _MyLog.WarnFormat("New AerRno PageBreak Logic: Step Could Have Fit {0}, {1}", MyItemInfo.ItemID, MyItemInfo.ShortPath); + } else // RHM20150507 Table Scrunch - _MyLog.WarnFormat("Step Could Have Fit {0}, {1}",MyItemInfo.ItemID,MyItemInfo.ShortPath); + _MyLog.WarnFormat("Equal: Step Could Have Fit {0}, {1}", MyItemInfo.ItemID, MyItemInfo.ShortPath); else if (!vPara.Processed && ((vPara.YOffset) < YTopMost)) retval = Math.Min(retval, vPara.YTopMost); }