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

B2021-133 indent of HLS & subsection should be the same

Browse Source 
B2021-133 BNPP1new indent of HLS & subsection should be the same
This commit is contained in:
Kathy Ruffing 2021-12-07 15:26:07 +00:00
parent 37e022a64d
commit 4522b2a636
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
PROMS/Formats/fmtall/BNPP1Newall.xml
View File

Binary file not shown.

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

@ -4199,6 +4199,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _TieTabToLevel, "@TieTabToLevel"); return LazyLoad(ref _TieTabToLevel, "@TieTabToLevel");
} }
} }
private LazyLoad<bool> _SubSectAndHighSameLevel;
public bool SubSectAndHighSameLevel
{
get
{
return LazyLoad(ref _SubSectAndHighSameLevel, "@SubSectAndHighSameLevel");
}
}
private LazyLoad<bool> _HighLevelRNOBeforeAERSubsteps; private LazyLoad<bool> _HighLevelRNOBeforeAERSubsteps;
public bool HighLevelRNOBeforeAERSubsteps public bool HighLevelRNOBeforeAERSubsteps
{ {

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

@ -6110,6 +6110,8 @@ namespace Volian.Print.Library
&& !(itemInfo.MyDocStyle.SpecialStepsFoldout && itemInfo.MyDocStyle.UseColSByLevel)) && !(itemInfo.MyDocStyle.SpecialStepsFoldout && itemInfo.MyDocStyle.UseColSByLevel))
{ {
int indxLevel = itemInfo.PrintLevel + itemInfo.CurrentSectionLevel(); 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 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 seclvlindent = colsbylevel - (float)formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ColS;
float adjCols = (float)formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ColS + seclvlindent; 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())); myTab.Rtf = myTab.Rtf.Replace(myTab.Text, myTab.Text.TrimStart(" ".ToCharArray()));
if (formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList != null && if (formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList != null &&
formatInfo.PlantFormat.FormatData.SectData.StepSectionData.StepSectionPrintData.LeftJustifyList.Count > 0) 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 else
XOffset = myTab.XOffset + (myTab.Text.Length * (float)itemInfo.FormatStepData.Font.CPI) - colsbylevel; 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) 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(); 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); float tableftadj = GetLeftJustify(formatInfo, indxLevels);
if (tableftadj != 0) if (tableftadj != 0)
{ {