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

B2018-022: Added flag ‘SupInfoIncludeParTab’ to control whether parent tab is included as part of tab for supinfo

Browse Source 
B2018-022: Use flag ‘SupInfoIncludeParTab’ to control whether parent tab is included as part of tab for supinfo
This commit is contained in:
Kathy Ruffing 2018-02-09 16:33:09 +00:00
parent e82b5f1adf
commit 3d37e6a61c
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

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

@ -843,6 +843,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _SupInfoTabOff, "@SupInfoTabOff"); return LazyLoad(ref _SupInfoTabOff, "@SupInfoTabOff");
} }
} }
private LazyLoad<bool> _SupInfoIncludeParTab;
public bool SupInfoIncludeParTab
{
get
{
return LazyLoad(ref _SupInfoIncludeParTab, "@SupInfoIncludeParTab");
}
}
private LazyLoad<string> _TopOfPageThing; private LazyLoad<string> _TopOfPageThing;
public string TopOfPageThing public string TopOfPageThing
{ {

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

@ -4304,7 +4304,13 @@ namespace Volian.Print.Library
else if (itemInfo.MyParent.IsNote) else if (itemInfo.MyParent.IsNote)
strmytab = "Note"; strmytab = "Note";
else else
strmytab = ItemInfo.GetCombinedTab(itemInfo.MyParent, itemInfo.MyParent.MyParent.CombinedTab); {
// B2018-022: use flag to determine whether to pre-pend the parent's tab as part of the supplemental info tab
// (if the procedure tab is long, such as in Farley, the tab overwrites text in the supplemental info pages)
strmytab = itemInfo.ActiveSection.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoIncludeParTab
? ItemInfo.GetCombinedTab(itemInfo.MyParent, itemInfo.MyParent.MyParent.CombinedTab)
: itemInfo.MyTab.CleanText;
}
strmytab = strmytab.Trim(); strmytab = strmytab.Trim();
mytab = new vlnTab(cb, this, strmytab, strmytab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline); mytab = new vlnTab(cb, this, strmytab, strmytab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline);
return mytab; return mytab;