From a6a9305f7d025356da61f4908878c2590a6f2894 Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 20 Jul 2018 15:22:27 +0000 Subject: [PATCH] C0218-022: If tab is too long, move text xoffset over for SAMG Supplemental Info (default flag to false) --- PROMS/Formats/fmtall/BASEall.xml | Bin 85612 -> 85686 bytes PROMS/Formats/fmtall/WCNSAMall.xml | Bin 90284 -> 90356 bytes .../Format/PlantFormat.cs | 8 ++++++++ PROMS/Volian.Print.Library/vlnParagraph.cs | 3 +++ 4 files changed, 11 insertions(+) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 78e7bfa10800a72f93f0674e8730322dcd427fb2..57398a9294e28dfa08ce61cfb39c366645ddc67f 100644 GIT binary patch delta 82 zcmaDehjrUr)(sL`=D`f533@Hp*K#^jG5{3u{f1p?zgBwu1h`|R) h<}su*gfJvBBrzyVHq;iLEa1k{ETgquMvE~(1prH`63GAn delta 18 Zcmdlsm-WpY)(sL`%}H9@le8E^Q~*h!2BQD~ diff --git a/PROMS/Formats/fmtall/WCNSAMall.xml b/PROMS/Formats/fmtall/WCNSAMall.xml index 31088b0e54c053cd640405d56a26ee39365ac84e..367f8f4f3827d078070b5b97c00189460cbbc346 100644 GIT binary patch delta 86 zcmZ2;koC(!)(sUb&ZP_m44w>m3~3Dc42}#b3|S1N48;s33=s_eK(RCiH=uYCgAb6* kV@PKRVMt_1Vo+ePWl#dLi-2lV8I+ofS+*CmFj~d{0Jeh@xBvhE delta 22 ecmexzkaf*L)(sUbldA-Hn$NIoKf}VP5d#2pr3m2w diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 43118c10..68c19ca2 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -854,6 +854,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _SupInfoIncludeParTab, "@SupInfoIncludeParTab"); } } + private LazyLoad _SupInfoAdjustXOffForLongTab; + public bool SupInfoAdjustXOffForLongTab + { + get + { + return LazyLoad(ref _SupInfoAdjustXOffForLongTab, "@SupInfoAdjustXOffForLongTab"); + } + } private LazyLoad _TopOfPageThing; public string TopOfPageThing { diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 9a36d53a..6d4b1a1c 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -5588,7 +5588,10 @@ namespace Volian.Print.Library myTab.XOffset = XOffset - ((myTab == null) ? 0 : myTab.Width) - 12; // B2017-253 - Limit the tab offset to 2 points inside the left margin myTab.XOffset = Math.Max(myTab.XOffset,itemInfo.MyDocStyle.Layout.LeftMargin ?? 72)+2; + float mytbwidth = myTab.Width; myTab.Width = 2.5f * myTab.Width; + // C2018-022: adjust xoffset of text by 12 if the tab would overwrite the text and the format flag is on: + if (itemInfo.ActiveFormat.PlantFormat.FormatData.PrintData.SupInfoAdjustXOffForLongTab && myTab.XOffset + mytbwidth > XOffset) XOffset += 12; } // B2017-102: need to set width here since using Xoffset because AdjustWidth is called before this adjustment. Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - XOffset - (sitabloc / 2);