Calvert Alarms: CONDITION/RESPONSE top continue messages improvements.

This commit is contained in:
2014-08-20 13:49:22 +00:00
parent 831858d19e
commit 77e02fd438
2 changed files with 75 additions and 24 deletions

View File

@@ -49,17 +49,17 @@ namespace Volian.Print.Library
get { return _TopMessageRs; }
set { _TopMessageRs = value; }
}
private vlnText _TopMessageSub1; // BGE Alarms: in CONDITION/RESPONSE if break within substep
public vlnText TopMessageSub1
private List<vlnText> _TopMessageSub1s=new List<vlnText>(); // BGE Alarms: in CONDITION/RESPONSE if break within substep
public List<vlnText> TopMessageSub1s
{
get { return _TopMessageSub1; }
set { _TopMessageSub1 = value; }
get { return _TopMessageSub1s; }
set { _TopMessageSub1s = value; }
}
private vlnText _TopMessageSub2; // BGE Alarms: in CONDITION/RESPONSE if break within substep
public vlnText TopMessageSub2
private List<vlnText> _TopMessageSub2s=new List<vlnText>(); // BGE Alarms: in CONDITION/RESPONSE if break within substep
public List<vlnText> TopMessageSub2s
{
get { return _TopMessageSub2; }
set { _TopMessageSub2 = value; }
get { return _TopMessageSub2s; }
set { _TopMessageSub2s = value; }
}
private vlnText _BottomMessage;
public vlnText BottomMessage
@@ -565,17 +565,23 @@ namespace Volian.Print.Library
}
TopMessageRs = null; // Only output it once.
}
if (TopMessageSub1 != null)
if (TopMessageSub1s != null)
{
TopMessageSub1.YOffset = AlarmYoffStart - 3 * vlnPrintObject.SixLinesPerInch;
TopMessageSub1.ToPdf(cb, 0, ref tmp, ref tmp);
TopMessageSub1 = null; // Only output it once.
foreach (vlnText vts1 in TopMessageSub1s)
{
vts1.YOffset = AlarmYoffStart - 3 * vlnPrintObject.SixLinesPerInch;
vts1.ToPdf(cb, 0, ref tmp, ref tmp);
}
TopMessageSub1s = null; // Only output it once.
}
if (TopMessageSub2 != null)
if (TopMessageSub2s != null)
{
TopMessageSub2.YOffset = AlarmYoffStart - 3 * vlnPrintObject.SixLinesPerInch;
TopMessageSub2.ToPdf(cb, 0, ref tmp, ref tmp);
TopMessageSub2 = null; // Only output it once.
foreach (vlnText vts2 in TopMessageSub2s)
{
vts2.YOffset = AlarmYoffStart - 3 * vlnPrintObject.SixLinesPerInch;
vts2.ToPdf(cb, 0, ref tmp, ref tmp);
}
TopMessageSub2s = null; // Only output it once.
}
if (BottomMessage != null)
{