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

F2021-042: BNPP1 Order of Notes, Cautions, Warnings, etc

Browse Source
This commit is contained in:
Kathy Ruffing 2021-09-30 13:32:45 +00:00
parent 68ecbcea09
commit c0d8d17a91
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5243,6 +5243,15 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _CenterOneLineOnly, "@CenterOneLineOnly"); return LazyLoad(ref _CenterOneLineOnly, "@CenterOneLineOnly");
} }
} }
// F2021-042: Added FormatStepData.AlwaysCenter for BNPP1 - Critical Step text always must be centered
private LazyLoad<bool> _AlwaysCenter;
public bool AlwaysCenter
{
get
{
return LazyLoad(ref _AlwaysCenter, "@AlwaysCenter");
}
}
private LazyLoad<bool> _SubTableGetsUp1Level; private LazyLoad<bool> _SubTableGetsUp1Level;
public bool SubTableGetsUp1Level public bool SubTableGetsUp1Level
{ {

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

@ -1019,7 +1019,9 @@ namespace Volian.Print.Library
// Check if only one line, i.e. "Height < (1.2F * IParagraph.Leading". The Leading can be for six or seven lines per inch, so the 1.2 // Check if only one line, i.e. "Height < (1.2F * IParagraph.Leading". The Leading can be for six or seven lines per inch, so the 1.2
// multiplier accounts for both. // multiplier accounts for both.
// B2021-091 added a null reference check - MyItemInfo was a section and didn't have FormatStepData // B2021-091 added a null reference check - MyItemInfo was a section and didn't have FormatStepData
if (!MyItemInfo.IsStepSection && MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.CenterOneLineOnly && ((MyItemInfo.MyPrevious == null && MyItemInfo.NextItem == null) || MyItemInfo.FormatStepData.SeparateBox || doAlign) && Height < (1.2F * IParagraph.Leading)) // F2021-042: Added FormatStepData.AlwaysCenter for BNPP1 - Critical Step text always must be centered
if (!MyItemInfo.IsStepSection && MyItemInfo.FormatStepData != null && MyItemInfo.FormatStepData.CenterOneLineOnly && ((MyItemInfo.MyPrevious == null && MyItemInfo.NextItem == null)
|| MyItemInfo.FormatStepData.SeparateBox || doAlign || MyItemInfo.FormatStepData.AlwaysCenter) && Height < (1.2F * IParagraph.Leading))
IParagraph.Alignment = Element.ALIGN_CENTER; IParagraph.Alignment = Element.ALIGN_CENTER;
// if this step is centered, but not part of the checklist or valvelist format, use itextsharp to center it. // if this step is centered, but not part of the checklist or valvelist format, use itextsharp to center it.
// if it was part of the checklist or valvelist, then the centering is based on the column definitions for the table and // if it was part of the checklist or valvelist, then the centering is based on the column definitions for the table and