From 74a8145f1d3ad16e9ad75fcbf69e16f6da191128 Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Fri, 24 Oct 2014 16:50:19 +0000
Subject: [PATCH] Changed DBSequence to Short Path in debug output

---
 PROMS/Volian.Print.Library/vlnParagraph.cs | 46 +++++++---------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 29b2f37a..02615fc4 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -904,8 +904,8 @@ namespace Volian.Print.Library
 		{
 			get
 			{
-				return string.Format("DebugID = {0}, ID={1} Type={2} TypeName='{3}' StepLevel={4} DBSequence={5} Width={6} Left={7}",
-				  DebugId, MyItemInfo.ItemID, MyItemInfo.FormatStepType, MyItemInfo.FormatStepData == null ? "NoStepData" : MyItemInfo.FormatStepData.Type, MyItemInfo.StepLevel, MyItemInfo.DBSequence, Width, XOffset);
+				return string.Format("DebugID = {0}, ID={1} Type={2} TypeName='{3}' StepLevel={4} ShortPath={5} Width={6} Left={7}",
+				  DebugId, MyItemInfo.ItemID, MyItemInfo.FormatStepType, MyItemInfo.FormatStepData == null ? "NoStepData" : MyItemInfo.FormatStepData.Type, MyItemInfo.StepLevel, MyItemInfo.ShortPath, Width, XOffset);
 			}
 		}
 		private void ResetDocStyleAndValues(ref float yTopMargin, ref float yBottomMargin)
@@ -2685,28 +2685,10 @@ namespace Volian.Print.Library
 							xloc_co = XOffset + (relX > 0 ? Width : 0) + relX;
 						}
 					}
-
-					// if xtraCheckOffLines is a negative number, start the checkoff on the same line
-					// as text and adjust the y-offset after the checkoff by the amount of the absolute
-					// value of xtraCheckOffLines.
-					// if xtraCheckOffLines is a positive number, start the checkoff xtraCheckOffLines - 1
-					// down from the text and adjust the y-offset after the checkoff by the amount
-					// of xtraCheckOffLines.
-					float xtraCheckOffLines = (co.CheckOffXtraLines ?? 0);
-					if (xtraCheckOffLines < 0)
-					{
-						xtraCheckOffLines = -xtraCheckOffLines;
-						xtraCheckOffLines *= SixLinesPerInch;
-						PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff/* + xtraCheckOffLines */, co.Macro));
-						yoff += xtraCheckOffLines;
-					}
-					else
-					{
-						xtraCheckOffLines *= SixLinesPerInch;
-						xtraCheckOffLines -= ((xtraCheckOffLines > 0) ? SixLinesPerInch : 0);
-						PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff + xtraCheckOffLines, co.Macro));
-						yoff += (xtraCheckOffLines != 0) ? xtraCheckOffLines + SixLinesPerInch : 0;
-					}
+					float xtraCheckOffLines = (co.CheckOffXtraLines ?? 0) * SixLinesPerInch;
+					xtraCheckOffLines -= ((xtraCheckOffLines>0)? SixLinesPerInch:0);
+					PartsRight.Add(new vlnMacro(xloc_co, yForCheckoff + xtraCheckOffLines, co.Macro));
+					yoff += (xtraCheckOffLines > 0) ? xtraCheckOffLines + SixLinesPerInch : 0;
 				}
 			}
 			float yOffRight = yoff;
@@ -3204,16 +3186,16 @@ namespace Volian.Print.Library
 			int everyNLines = MyItemInfo.FormatStepData == null ? 1 : MyItemInfo.FormatStepData.StepLayoutData.EveryNLines ?? 1;
 			if (everyNLines == -99) return 0;
 			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvertAlarm ||
-					(MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && (MyItemInfo.MyTab!= null && MyItemInfo.MyTab.CleanText != string.Empty)))
+					MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
 			{
-				if ((MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.MyParent.IsCaution || MyItemInfo.MyParent.IsNote) && !MyItemInfo.FormatStepData.SpaceIn
-					&& (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0)
-					&& (MyItemInfo.GetNextItem() == null || MyItemInfo.MyContent.Type != MyItemInfo.GetNextItem().MyContent.Type)) return 0;
+			if ((MyItemInfo.IsCaution || MyItemInfo.IsNote || MyItemInfo.MyParent.IsCaution || MyItemInfo.MyParent.IsNote)  && !MyItemInfo.FormatStepData.SpaceIn
+				&& (MyItemInfo.Steps == null || MyItemInfo.Steps.Count == 0)
+				&& (MyItemInfo.GetNextItem() == null || MyItemInfo.MyContent.Type != MyItemInfo.GetNextItem().MyContent.Type)) return 0;
 				if (everyNLines == 99 && MyItemInfo.GetNextItem() == null)
-				{
-					if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && MyItemInfo.Steps[0].MyContent.Type == MyItemInfo.MyContent.Type) return 0;
-					if (MyItemInfo.MyParent.GetNextItem() != null && MyItemInfo.MyParent.GetNextItem().MyContent.Type == MyItemInfo.MyContent.Type) return 0;
-				}
+			{
+				if (MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0 && MyItemInfo.Steps[0].MyContent.Type == MyItemInfo.MyContent.Type) return 0;
+				if (MyItemInfo.MyParent.GetNextItem() != null && MyItemInfo.MyParent.GetNextItem().MyContent.Type == MyItemInfo.MyContent.Type) return 0;
+			}
 			}
 			if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.GetNextItem() == null) return SixLinesPerInch;
 			// Pagination issue to be used with yEndsWithBlankLine in Pagination code, but not checked in yet.