From 1a03c1b329c1961bc7fbb0d8e16ff31ab86f287c Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 11 Aug 2014 15:23:18 +0000 Subject: [PATCH] =?UTF-8?q?BGE:=20If=20=E2=80=98ANNUNCIATOR=20COMPENSATORY?= =?UTF-8?q?=20ACTIONS=E2=80=99=20starts=20on=20a=20new=20page,=20fixed=20y?= =?UTF-8?q?-location=20so=20does=20not=20print=20too=20far=20down=20on=20p?= =?UTF-8?q?age;=20fix=20x-offset=20of=20non-tabbed=20&=20non-sequential=20?= =?UTF-8?q?steps=20in=20=E2=80=98CONDITION/RESPONSE=E2=80=99=20table=20so?= =?UTF-8?q?=20they=20don=E2=80=99t=20overwrite=20vertical=20table=20line.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Print.Library/vlnParagraph.cs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index f3da7023..e9f40c6f 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1069,7 +1069,14 @@ namespace Volian.Print.Library MyPageHelper.AlarmYoffStart = alrmY - 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. if (MyItemInfo.MyHLS != null && MyItemInfo.MyHLS.FormatStepData.UseSmartTemplate) { @@ -1902,6 +1909,16 @@ namespace Volian.Print.Library } if (adjustAgain) 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.IsInRNO)