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

B2022-003: BNPPalr - line spacing inconsistency between Explicit And & sub-steps

Browse Source
This commit is contained in:
Kathy Ruffing 2022-01-06 16:42:01 +00:00
parent 8fae5f6b31
commit 653a504234
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@ -6102,6 +6102,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _Justify, "StepPrintData/@Justify"); return LazyLoad(ref _Justify, "StepPrintData/@Justify");
} }
} }
private LazyLoad<bool> _BlankAfterSubWithSub;
public bool BlankAfterSubWithSub // B2022-003: BNPP Alarms (BNPPalr) - incorrect line spacing for substeps off substeps.
{
get
{
return LazyLoad(ref _BlankAfterSubWithSub, "StepPrintData/@BlankAfterSubWithSub");
}
}
} }
#endregion #endregion
#region TypeMenu #region TypeMenu

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

@ -5308,6 +5308,9 @@ namespace Volian.Print.Library
} }
if (MyItemInfo.Ordinal % everyNLines == 0 || MyItemInfo.NextItem == null) return SixLinesPerInch; 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 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; 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. // Pagination issue to be used with yEndsWithBlankLine in Pagination code, but not checked in yet.