From 653a5042349411c2b8ac822d103f5ca12051e3ec Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 6 Jan 2022 16:42:01 +0000 Subject: [PATCH] B2022-003: BNPPalr - line spacing inconsistency between Explicit And & sub-steps --- PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 3 +++ 2 files changed, 11 insertions(+) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 0e892622..1e6645d2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -6102,6 +6102,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Justify, "StepPrintData/@Justify"); } } + private LazyLoad _BlankAfterSubWithSub; + public bool BlankAfterSubWithSub // B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps. + { + get + { + return LazyLoad(ref _BlankAfterSubWithSub, "StepPrintData/@BlankAfterSubWithSub"); + } + } } #endregion #region TypeMenu diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index e74c5e7b..3190dee7 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5308,6 +5308,9 @@ namespace Volian.Print.Library } if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch; + // B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps. Added a format flag so as not to affect other plants. + if (MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.StepPrintData != null && MyItemInfo.FormatStepData.StepPrintData.BlankAfterSubWithSub && MyItemInfo.NextItem != null && MyItemInfo.HasChildren && MyItemInfo.Steps != null && MyItemInfo.Steps.Count > 0) return SixLinesPerInch; + // If the next table child is a figure, equation or a visio drawing add a blank line if (MyItemInfo.Tables != null && MyItemInfo.Tables.Count > 0 && MyItemInfo.Tables[0].MyContent.MyGrid == null) return SixLinesPerInch; // Pagination issue to be used with yEndsWithBlankLine in Pagination code, but not checked in yet.