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

BGE: If ‘ANNUNCIATOR COMPENSATORY ACTIONS’ starts on a new page, fixed y-location so does not print too far down on page; fix x-offset of non-tabbed & non-sequential steps in ‘CONDITION/RESPONSE’ table so they don’t overwrite vertical table line.

Browse Source
This commit is contained in:
Kathy Ruffing 2014-08-11 15:23:18 +00:00
parent 34dca7cc46
commit 1a03c1b329
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1069,7 +1069,14 @@ namespace Volian.Print.Library
MyPageHelper.AlarmYoffStart = alrmY - SixLinesPerInch; MyPageHelper.AlarmYoffStart = alrmY - SixLinesPerInch;
yPageStart -= (4 * SixLinesPerInch); yPageStart -= (4 * SixLinesPerInch);
} }
// For Calvert Alarms, if there is no box & this is top of page, if previous step
// had box (macro), adjust up page. The constructor (vlnParagraph), inserted these
// lines after the box so that the following text did not print right next to box.
if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm)
{
if (MyItemInfo.MyPrevious != null && MyItemInfo.MyPrevious.TemplateIndex > 0 && MyItemInfo.ActiveFormat.PlantFormat.FormatData.Templates[MyItemInfo.MyPrevious.TemplateIndex].hmacro > 0)
yPageStart += (3 * SixLinesPerInch);
}
// Now check if this is a template type step & if so, add the HLS's prefix/suffix to it. // Now check if this is a template type step & if so, add the HLS's prefix/suffix to it.
if (MyItemInfo.MyHLS != null && MyItemInfo.MyHLS.FormatStepData.UseSmartTemplate) if (MyItemInfo.MyHLS != null && MyItemInfo.MyHLS.FormatStepData.UseSmartTemplate)
{ {
@ -1902,6 +1909,16 @@ namespace Volian.Print.Library
} }
if (adjustAgain) if (adjustAgain)
AdjustXOffsetForTab(itemInfo, maxRNO, formatInfo, mytab, xMetaAdj); AdjustXOffsetForTab(itemInfo, maxRNO, formatInfo, mytab, xMetaAdj);
// For Calvert Alarms: if within the CONDITION/RESPONSE table, indent by 1 character.
// Sequential substeps are ok because of the tab string, but items without a tab & other step
// types were writing over the CONDITION/RESPONSE vertical table line. This code uses
// 7.2 for the character size to match 16bit output.
if (itemInfo.IsStep && !itemInfo.IsSequential && !itemInfo.IsCaution && !itemInfo.IsNote && MyParent.HasCalvertMacro)
{
XOffset += 7.2f;
if (mytab != null) mytab.XOffset += 7.2f;
}
if ((itemInfo.IsCaution || itemInfo.IsNote) && (itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DoubleBoxHLS) == E_DocStructStyle.DoubleBoxHLS) if ((itemInfo.IsCaution || itemInfo.IsNote) && (itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DoubleBoxHLS) == E_DocStructStyle.DoubleBoxHLS)
{ {
if (itemInfo.IsInRNO) if (itemInfo.IsInRNO)