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

force alignment of ‘Unnumbered High Level Step’ with section text

Browse Source 
Calvert: force alignment of ‘Unnumbered High Level Step’ with section text
This commit is contained in:
Kathy Ruffing 2014-11-12 15:17:17 +00:00
parent 9eed40353e
commit bcc0ec5a3b
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

@ -4104,6 +4104,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _AlignNullTabWSectHead, "@AlignNullTabWSectHead"); return LazyLoad(ref _AlignNullTabWSectHead, "@AlignNullTabWSectHead");
} }
} }
private LazyLoad<bool> _ForceAlignNullTabWSectHead;
public bool ForceAlignNullTabWSectHead
{
get
{
return LazyLoad(ref _ForceAlignNullTabWSectHead, "@ForceAlignNullTabWSectHead");
}
}
private LazyLoad<bool> _AlignHLSTabWithSectOvride; private LazyLoad<bool> _AlignHLSTabWithSectOvride;
public bool AlignHLSTabWithSectOvride public bool AlignHLSTabWithSectOvride
{ {

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

@ -4039,8 +4039,11 @@ namespace Volian.Print.Library
else else
{ {
XOffset += xoff; XOffset += xoff;
// For Calvert, adjust from the left margin and current section's tab. // For Calvert, adjust from the left margin and current section's tab. This is used
if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) // in BGEEOP (see EOP-0/Purpose ). However, it caused BGESTP's to print LossOfAC steps (unnumbered HLS) too
// far to the left. The ForceAlignNullTabWSectHead was introduced so that for that step type (LossOfAC) in STP/OI format,
// the SectData.SectionHeader.Pos was used rather than SectData.SectionNumber.Pos
if (myTab == null && !itemInfo.FormatStepData.ForceAlignNullTabWSectHead && itemInfo.FormatStepData.AlignNullTabWSectHead && itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos; XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionNumber.Pos;
else if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead) else if (myTab == null && itemInfo.FormatStepData.AlignNullTabWSectHead)
XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos; XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos;