From 63ca6242b19ebba84f1cbc2c7c9d248711e47699 Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Wed, 25 Feb 2015 14:24:22 +0000
Subject: [PATCH] =?UTF-8?q?center=20the=20sub-headers=20(Caution1)=20print?=
 =?UTF-8?q?=20sub-headers=20for=20Calvert=E2=80=99s=20valve=20format?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PROMS/Formats/fmtall/BGEVLall.xml          | Bin 48616 -> 48696 bytes
 PROMS/Volian.Print.Library/vlnParagraph.cs |  29 ++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/PROMS/Formats/fmtall/BGEVLall.xml b/PROMS/Formats/fmtall/BGEVLall.xml
index 628864aa48f53e178d19830ad8bbb7652d26f981..0623253003b357726b931f0c999bc4a8fbb96583 100644
GIT binary patch
delta 38
wcmV+>0NMZO`vSQ90<ii^lVC9jlgexqlhk<<lXyH1ljuPdlTb7!vmi{!ad0saMgRZ+

delta 18
acmdn-hv~&{rVYQmCkL3QZ7%RRQ3wEGRS9+g

diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 13ec5e84..670727ba 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -138,9 +138,11 @@ namespace Volian.Print.Library
 					else
 					{
 						// childItemInfo = 'child' and set to use a template for defining size.
-						if (childItemInfo.Steps == null)
+						// Note that the 'IsCaution1' was added for Calvert Valve lists, i.e.
+						// the Caution1 is a subheader & must be printed within the valve list table.
+						if (childItemInfo.Steps == null && !childItemInfo.IsCaution1)
 							continue;
-						childItemInfo = childItemInfo.Steps[0];
+						if (!childItemInfo.IsCaution1) childItemInfo = childItemInfo.Steps[0];
 						didComponentTableRow = true;
 					}
 				}
@@ -2893,6 +2895,17 @@ namespace Volian.Print.Library
 				// y direction (bottommost) across the row.
 				if (itemInfo.IsStep && itemInfo.MyHLS != null && (itemInfo.MyHLS.FormatStepData.UseSmartTemplate || (itemInfo.MyHLS.FormatStepData.UseOldTemplate && itemInfo.MyDocStyle.ComponentList)) && (TheStepLevel(itemInfo) >= 0))
 					savCheckListBottomMost = yoff + Height + (itemInfo.MyHLS.FormatStepData.UseSmartTemplate ? SixLinesPerInch : 0);
+
+				// The following was added for BGE valve lists, this format (BGEVLV) used caution1 as
+				// a subheader within the valve list.  To print correctly, a line needs to be added to
+				// where the bottom of this (subheader) is located and XOffset is set to the leftmargin.
+				if (itemInfo.IsStep && itemInfo.MyHLS != null && !itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsCaution1 && itemInfo.MyHLS.FormatStepData.UseOldTemplate && itemInfo.MyDocStyle.ComponentList)
+				{
+					savCheckListBottomMost += SixLinesPerInch;
+					yoff += Height;
+					XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin;
+				}
+
 				if (itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && itemInfo.IsCaution1) savCheckListBottomMost = yoff + Height;
 				// Get Y offset for regular steps, or if section title is output or if not within row (not last column of
 				// text) for wcn checklist, i.e.
@@ -3150,7 +3163,7 @@ namespace Volian.Print.Library
 			}
 			YBottomMost = yoff;
 
-			if (MyItemInfo.IsHigh && MyItemInfo.MyDocStyle.LandscapePageList && MyItemInfo.MyDocStyle.ComponentList)
+			if ((MyItemInfo.IsHigh || MyItemInfo.IsCaution1) && MyItemInfo.MyDocStyle.LandscapePageList && MyItemInfo.MyDocStyle.ComponentList)
 			{
 				// put out line after step (for BGEVLV format)
 				float macroY = YBottomMost-(0.25f * SixLinesPerInch);
@@ -4419,6 +4432,16 @@ namespace Volian.Print.Library
 				widOvrd = itemInfo.FormatStepData == null ? null : itemInfo.FormatStepData.WidthOverride == null ? null :
 					(float?)ToInt(itemInfo.FormatStepData.WidthOverride, maxRNO);
 
+			// Calvert subheaders in valve lists - the text gets centered, so the width is the width
+			// of the page (also, don't do this for alarms, thus the !SpecialCaseCalvert Alarms, since
+			// alarms use Caution1 as the annunciator):
+			if (itemInfo.IsStep && itemInfo.MyHLS != null && !itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm && 
+				itemInfo.MyHLS.FormatStepData.UseOldTemplate && itemInfo.MyDocStyle.ComponentList && itemInfo.IsCaution1)
+			{
+				Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - (float)itemInfo.MyDocStyle.Layout.LeftMargin;
+				return;
+			}
+
 			// Calvert Alarms had a case where the Title With Text Below (type 42) did not match
 			// any of the template items, but needed the width from the template.  The previous step (of
 			// same type) was in the template.  Check for this case.  The issue can be found in