From 3d37e6a61c3a252f3154f53dbea4bd5408362584 Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 9 Feb 2018 16:33:09 +0000 Subject: [PATCH] =?UTF-8?q?B2018-022:=20Added=20flag=20=E2=80=98SupInfoInc?= =?UTF-8?q?ludeParTab=E2=80=99=20to=20control=20whether=20parent=20tab=20i?= =?UTF-8?q?s=20included=20as=20part=20of=20tab=20for=20supinfo=20B2018-022?= =?UTF-8?q?:=20Use=20flag=20=E2=80=98SupInfoIncludeParTab=E2=80=99=20to=20?= =?UTF-8?q?control=20whether=20parent=20tab=20is=20included=20as=20part=20?= =?UTF-8?q?of=20tab=20for=20supinfo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/FNPSAM1all.xml | Bin 70220 -> 70278 bytes .../Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/FNPSAM1all.xml b/PROMS/Formats/fmtall/FNPSAM1all.xml index 651d7580e1de7fcbeb922a3564e94e622d0c85aa..431dba081c3def72d745fe1f43b8bbf63037dabc 100644 GIT binary patch delta 56 zcmX@Jgr#jM%LWxD#bAa~h5`mphCGHehI}xc%#Z^VOJPW52w+HLD4HyoBH66Mv|WXX HQ9}R#p5F~7 delta 18 ZcmZo$%5r82%LWyu<~XM9aZHRF0sukR1+4%8 diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 9f746944..d0cac8f9 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -843,6 +843,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoTabOff, "@SupInfoTabOff"); } } + private LazyLoad _SupInfoIncludeParTab; + public bool SupInfoIncludeParTab + { + get + { + return LazyLoad(ref _SupInfoIncludeParTab, "@SupInfoIncludeParTab"); + } + } private LazyLoad _TopOfPageThing; public string TopOfPageThing { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index cdfd1e4b..9a9f08ee 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4304,7 +4304,13 @@ namespace Volian.Print.Library else if (itemInfo.MyParent.IsNote) strmytab = "Note"; 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(); mytab = new vlnTab(cb, this, strmytab, strmytab, localXOffset, yoff, itemInfo.MyTab.MyFont, doSectTab, StepRTB.MySymbolFontName, itemInfo.MyTab.RemovedStyleUnderline); return mytab;