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

C2019-040 added a format flag to adjust text width when a checkoff is used but not a checkoff header.

Browse Source 
C2019-040 added a format flag to existing logic that will adjust text width when a checkoff is used on at least one step element, but a checkoff header is not being used
This commit is contained in:
John Jenko 2019-10-30 15:08:54 +00:00
parent 4a75b61f46
commit 61ef1d4b40
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -1891,6 +1891,16 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _CheckoffOnSubStepsOnly, "@CheckoffOnSubStepsOnly");
}
}
// C2019-040 This will adjust the right margin (making room for the checkoff) without the need of selecting a checkoff header
// the flag allows us to use existing coding that prior to this was restricted by format file name
private LazyLoad<bool> _CheckoffsWithoutHeader;
public bool CheckoffsWithoutHeader
{
get
{
return LazyLoad(ref _CheckoffsWithoutHeader, "@CheckoffsWithoutHeader");
}
}
}
#endregion
#region CheckOff

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

@ -6227,7 +6227,8 @@ namespace Volian.Print.Library
{
float CheckOffAdj = 0;
bool ChkOff = itemInfo.MyDocStyle.UseCheckOffs;
if (itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert || itemInfo.ActiveFormat.Name.ToUpper().StartsWith("VCB"))
// C2019-040 use format flag to see if any of the steps in this section have a checkoff set - previously we check if the format file name starts with VCB (VCB no longer a customer)
if (itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert || itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckoffsWithoutHeader)
{
SectionInfo si = itemInfo.ActiveSection.GetSectionInfo();
ChkOff = si.HasInitials; // this determines if any steps within the section have checkoffs.
@ -6240,7 +6241,8 @@ namespace Volian.Print.Library
FmtHasAdj = true;
CheckOffAdj = -(float)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffAdjustment;
}
if (!itemInfo.ActiveFormat.Name.ToUpper().StartsWith("VCB")) // Don't do the following if in a vcb format (part of fix F2016-039)
// C2019-040 use format flag to not readjust the CheckOffAdj value - previously we check if the format file name starts with VCB (VCB no longer a customer)
if (!itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckoffsWithoutHeader) // Don't do the following if in a vcb format (part of fix F2016-039)
{
if (!HasCheckOffHeading(itemInfo, formatInfo) && CheckOffAdj < 0)
CheckOffAdj += (float)(9 * 7.2); // 9 is the size of the SIGNOFF adjustment
@ -6421,8 +6423,9 @@ namespace Volian.Print.Library
SectData sd = formatInfo.PlantFormat.FormatData.SectData;
if (((itemInfo.MyDocStyle.StructureStyle.Style & E_DocStructStyle.DSS_SameXOffSubsections) == E_DocStructStyle.DSS_SameXOffSubsections))
{
// don't adjust the width if there already was an adjustment for checkoffs - for VCB only (F2016-039)
if (!(itemInfo.ActiveFormat.Name.ToUpper().StartsWith("VCB") && coadj))
// don't adjust the width if there already was an adjustment for checkoffs - for VCB only (F2016-039) - VCB no longer a customer
// C2019-040 use format flag to adjust the width (was already don for checkoffs) - previously we check if the format file name starts with VCB (VCB no longer a customer)
if (!(itemInfo.ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckoffsWithoutHeader && coadj))
adjwidth = MyTab != null ? -MyTab.Width : 0;
}
else if (sd.UseMetaSections)