From 4522b2a6361976c29ea673507dd5c57837777fe5 Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 7 Dec 2021 15:26:07 +0000 Subject: [PATCH] B2021-133 indent of HLS & subsection should be the same B2021-133 BNPP1new indent of HLS & subsection should be the same --- PROMS/Formats/fmtall/BNPP1Newall.xml | Bin 204210 -> 204274 bytes .../Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 10 +++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index 965ad07c5de816f73bdb1aec5696342468441a76..8ecf38556ba93ab34788cdb16b655340c319c80c 100644 GIT binary patch delta 70 zcmdnAo9EMRo((>6`oRpP3`q>Z456%{_7LJ#mcNd*YbV_5%QYVhS_> diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 343fc323..c0f5b1b0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4199,6 +4199,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TieTabToLevel, "@TieTabToLevel"); } } + private LazyLoad _SubSectAndHighSameLevel; + public bool SubSectAndHighSameLevel + { + get + { + return LazyLoad(ref _SubSectAndHighSameLevel, "@SubSectAndHighSameLevel"); + } + } private LazyLoad _HighLevelRNOBeforeAERSubsteps; public bool HighLevelRNOBeforeAERSubsteps { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 38857e42..e74c5e7b 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -6110,6 +6110,8 @@ namespace Volian.Print.Library && !(itemInfo.MyDocStyle.SpecialStepsFoldout && itemInfo.MyDocStyle.UseColSByLevel)) { int indxLevel = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel(); + // B2021-113: BNPP1new - subsection & HLS should be same level (xoffset of tab & text) + if (formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.SubSectAndHighSameLevel && !MyItemInfo.MyActiveSection.MyParent.IsProcedure) indxLevel++; float colsbylevel = (float)formatInfo.PlantFormat.FormatData.SectData.MetaSectionList[indxLevel % formatInfo.PlantFormat.FormatData.SectData.MetaSectionList.MaxIndex].ColSByLevel; float seclvlindent = colsbylevel - (float)formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ColS; float adjCols = (float)formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ColS + seclvlindent; @@ -6121,7 +6123,11 @@ namespace Volian.Print.Library myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray())); if (formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList != null && formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList.Count > 0) - XOffset = myTab.XOffset + GetLeftJustify(formatInfo, indxLevel); + // B2021-113: BNPP1new - subsection & HLS should be same level (xoffset of tab & text) + if (formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.SubSectAndHighSameLevel && !MyItemInfo.MyActiveSection.MyParent.IsProcedure) + XOffset += tabWidth; + else + XOffset = myTab.XOffset + GetLeftJustify(formatInfo, indxLevel); // 2.1.1 goes here xoffset = 136 else XOffset = myTab.XOffset + (myTab.Text.Length * (float)itemInfo.FormatStepData.Font.CPI) - colsbylevel; } @@ -6283,6 +6289,8 @@ namespace Volian.Print.Library else if (myTab != null && itemInfo.IsSequential && formatInfo.PlantFormat.FormatData.SectData.UseMetaSections && formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList.Count > 0) { int indxLevels = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel(); + // B2021-113: BNPP1new - subsection & HLS should be same level (xoffset of tab & text) + if (formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.SubSectAndHighSameLevel && !MyItemInfo.MyActiveSection.MyParent.IsProcedure) indxLevels++; float tableftadj = GetLeftJustify(formatInfo, indxLevels); if (tableftadj != 0) {