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

For tab comparison, trim strings before doing comparison in code that determines whether subsection number is derived from section number (IsSubsectionNumber)

Browse Source 
If parent was continuous & this is separate, need to paginate to get subsection on its own page
For sections/subsections: if parent was continuous & this is separate, don’t reset docstyle until after separate section pagebreak; if separator location is ‘0’, x-offset should be at tab not text of step
This commit is contained in:
Kathy Ruffing 2014-12-04 16:03:06 +00:00
parent 78b211c90a
commit 27c8d89bed
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -1653,8 +1653,8 @@ namespace VEPROMS.CSLA.Library
string parNumber = par.DisplayNumber; string parNumber = par.DisplayNumber;
string myNumber = DisplayNumber; string myNumber = DisplayNumber;
if (parNumber == null || myNumber == null) return false; if (parNumber == null || myNumber == null) return false;
if (!parNumber.EndsWith(".0")) return false; if (!parNumber.Trim().EndsWith(".0")) return false;
return (myNumber.StartsWith(parNumber.Substring(0, parNumber.Length - 1))); return (myNumber.Trim().StartsWith(parNumber.Trim().Substring(0, parNumber.Length - 1)));
} }
} }
public bool IsSeparateSubsection public bool IsSeparateSubsection

4
PROMS/Volian.Print.Library/Pagination.cs
View File

@ -35,6 +35,10 @@ namespace Volian.Print.Library
if (MyItemInfo.IsSection && MyParent != null && MyParent.MyItemInfo.IsSection && (MyItemInfo as SectionInfo).IsSeparatePagination()) if (MyItemInfo.IsSection && MyParent != null && MyParent.MyItemInfo.IsSection && (MyItemInfo as SectionInfo).IsSeparatePagination())
{ {
ShowPageBreak(1, "Page Break between separate sections", "Yes", YSize, yPageSize, yWithinMargins, ManualPageBreak); ShowPageBreak(1, "Page Break between separate sections", "Yes", YSize, yPageSize, yWithinMargins, ManualPageBreak);
// if parent was continuous & this is separate, need to paginate to get subsection on
// its own page. This occurred in BGE/OI3 set/OI-7 procedure/10.0 Attachments.
if (!(MyParent.MyItemInfo as SectionInfo).IsSeparatePagination()) return 1;
if (MyItemInfo.MyPrevious != null) // add if statement to fix Westinghouse print issue 3-21-2014 if (MyItemInfo.MyPrevious != null) // add if statement to fix Westinghouse print issue 3-21-2014
return 1; return 1;
} }

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

@ -1055,8 +1055,13 @@ namespace Volian.Print.Library
// at the wrong level. Reset the page helper's section. // at the wrong level. Reset the page helper's section.
if (MyItemInfo.IsSection && MyItemInfo.MyPrevious == null && MyItemInfo.MyParent.IsSection && !MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseWestinghouse) if (MyItemInfo.IsSection && MyItemInfo.MyPrevious == null && MyItemInfo.MyParent.IsSection && !MyItemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseWestinghouse)
{ {
// if parent was continuous & this is separate, don't reset document style to subsection (next page) type
// this was putting incorrect pagelist item on parent section's page. This occurred in BGE/OI3 set/OI-7 procedure/10.0 Attachments.
if ((MyParent.MyItemInfo as SectionInfo).IsSeparatePagination() || !(MyItemInfo as SectionInfo).IsSeparatePagination())
{
MyPageHelper.MySection = MyItemInfo as SectionInfo; MyPageHelper.MySection = MyItemInfo as SectionInfo;
MyPageHelper.ResetSvg(); MyPageHelper.ResetSvg();
}
} }
// For Calvert Alarms: A macro exists around the CONDITION/RESPONSE portion. If the page break occurs so that // For Calvert Alarms: A macro exists around the CONDITION/RESPONSE portion. If the page break occurs so that
@ -3684,6 +3689,18 @@ namespace Volian.Print.Library
} }
else else
xoff = XOffset; // XOffset has left margin included xoff = XOffset; // XOffset has left margin included
// KEEP: This may be needed in the future to fix location of 'OR's when Separator location="0"
// the following code would place the 'OR' at the location of the tab rather than text. This
// is how 16bit was. However, a number of plants had been sent out with the xoffset at the xlocation
// of text (does not match 16bit) when this was found for BGE OI3/OI-1B/6.1.B.4. Previous releases
// went to CAT, MCG, FPL, NSP.
//{
// if (this.MyTab != null)
// xoff = this.MyTab.XOffset;
// else
// xoff = XOffset;
//}
vlnHeader myHeader = new vlnHeader(this, cb, itemInfo.MyHeader.Text, itemInfo.MyHeader.CleanText.TrimStart(" ".ToCharArray()), xoff + _MyBoxLeftAdj, YOffset, itemInfo.MyHeader.MyFont); vlnHeader myHeader = new vlnHeader(this, cb, itemInfo.MyHeader.Text, itemInfo.MyHeader.CleanText.TrimStart(" ".ToCharArray()), xoff + _MyBoxLeftAdj, YOffset, itemInfo.MyHeader.MyFont);
PartsAbove.Add(myHeader); PartsAbove.Add(myHeader);
//return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? SixLinesPerInch : 0); //return myHeader.Height + (!MyItemInfo.MyDocStyle.SpecialStepsFoldout || (MyItemInfo.MyDocStyle.ExtraLineHeader && (MyItemInfo.IsCaution || MyItemInfo.IsNote)) ? SixLinesPerInch : 0);