‘INITIALS’ pagelist fix & extraneous end message fix

fixed various check off line lengths (underlines now are lines in macro)
Calvert: adjust paragraph widths if section has a check off
Calvert: determine whether ‘INITIALS’ pagelist item is printed based on whether section has check offs
This commit is contained in:
Kathy Ruffing 2014-10-22 13:15:02 +00:00
parent bf99440bde
commit 91ef383ad4
7 changed files with 19 additions and 1 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1601,6 +1601,15 @@ namespace Volian.Print.Library
else else
plstr = plstr.Replace(token, "ONE AND TWO"); plstr = plstr.Replace(token, "ONE AND TWO");
break; break;
case "{INITIALS}":
// For Calvert: if this section has checkoffs turned on, put out this pagelist item:
// Get SectionInfos to access specific section config items...
SectionInfo si = SectionInfo.Get(MySection.ItemID);
SectionConfig sectCfg = si.MyConfig as SectionConfig;
int sc = sectCfg.Section_CheckoffListSelection;
if (sc < 2) plstr = plstr.Replace(token, "");
else plstr = plstr.Replace(token, "INITIALS");
break;
case "{REVUNIT}": case "{REVUNIT}":
// copied from 16bit's pagelist.cs for BGE: // copied from 16bit's pagelist.cs for BGE:
string revUnit = null; string revUnit = null;

View File

@ -4106,7 +4106,16 @@ namespace Volian.Print.Library
if (itemInfo.IsHigh) if (itemInfo.IsHigh)
{ {
float CheckOffAdj = 0; float CheckOffAdj = 0;
if (itemInfo.MyDocStyle.UseCheckOffs) bool ChkOff = itemInfo.MyDocStyle.UseCheckOffs;
if (itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
{
// For Calvert STP/OP: see if this section has checkoffs by looking in the section config:
SectionInfo si = SectionInfo.Get(itemInfo.ActiveSection.ItemID);
SectionConfig sectCfg = si.MyConfig as SectionConfig;
int sc = sectCfg.Section_CheckoffListSelection;
ChkOff = (sc >= 2);
}
if (ChkOff)
{ {
bool FmtHasAdj = false; bool FmtHasAdj = false;
if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffAdjustment != null) if (formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffAdjustment != null)