B2017-203: missing End message if continuous subsections & 2 sections’ end message on same page

This commit is contained in:
2017-09-12 13:02:48 +00:00
parent 8fd0230aa0
commit c87ec88245
4 changed files with 24 additions and 17 deletions

View File

@@ -85,8 +85,8 @@ namespace Volian.Print.Library
get { return _TopMessageSub2s; }
set { _TopMessageSub2s = value; }
}
private vlnText _BottomMessage;
public vlnText BottomMessage
private List<vlnText> _BottomMessage = new List<vlnText>(); // B2017-203) any continuous sections with end messages may have more than 1 message on a page
public List<vlnText> BottomMessage
{
get { return _BottomMessage; }
set { _BottomMessage = value; }
@@ -749,10 +749,13 @@ namespace Volian.Print.Library
}
TopMessageSub2s = null; // Only output it once.
}
if (BottomMessage != null)
if (BottomMessage != null && BottomMessage.Count != 0)
{
BottomMessage.ToPdf(cb, 0, ref tmp, ref tmp);
BottomMessage = null; // Only output it once.
foreach (vlnText vts3 in BottomMessage)
{
vts3.ToPdf(cb, 0, ref tmp, ref tmp);
}
BottomMessage.Clear(); // Only output it once.
}
if (BottomMessageR != null)
{
@@ -768,10 +771,13 @@ namespace Volian.Print.Library
public void DrawBottomMessage(PdfContentByte cb)
{
float tmp = 0;
if (BottomMessage != null)
if (BottomMessage != null && BottomMessage.Count != 0)
{
BottomMessage.ToPdf(cb, 0, ref tmp, ref tmp);
BottomMessage = null; // Only output it once.
foreach (vlnText vts in BottomMessage)
{
vts.ToPdf(cb, 0, ref tmp, ref tmp);
}
BottomMessage.Clear(); // Only output it once.
}
}
private void DrawChangeBars(PdfContentByte cb)