From dd49a26ef389b00fbb154a095af41eea4c8fd8bf Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 10 Apr 2015 13:54:18 +0000 Subject: [PATCH] =?UTF-8?q?If=20header=20includes=20leading=20spaces,=20in?= =?UTF-8?q?clude=20those=20in=20size=20of=20header=20(AEP=20has=20spaces?= =?UTF-8?q?=20in=20front=20of=20OR=20Use=20=E2=80=98RNOWidthAltAll?= =?UTF-8?q?=E2=80=99=20(for=20AEP)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Volian.Print.Library/vlnHeader.cs | 3 +++ PROMS/Volian.Print.Library/vlnParagraph.cs | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/PROMS/Volian.Print.Library/vlnHeader.cs b/PROMS/Volian.Print.Library/vlnHeader.cs index 6c857fe9..a7234ee4 100644 --- a/PROMS/Volian.Print.Library/vlnHeader.cs +++ b/PROMS/Volian.Print.Library/vlnHeader.cs @@ -10,6 +10,7 @@ namespace Volian.Print.Library { public partial class vlnHeader: vlnText { + private string _OrigStr; public float HeaderWidth { get { return _WidthAdjust + (MyFont.CharsToTwips * Text.Length); } @@ -21,6 +22,7 @@ namespace Volian.Print.Library YOffset = yoffset; Width = MyParent.Width; Text = cleanStr; + _OrigStr = (origStr.StartsWith(" ") && !origStr.Contains(@"\"))?origStr:null; Rtf = GetRtf(origStr, vFont); XOffset = xoffset; MyFont = vFont; @@ -31,6 +33,7 @@ namespace Volian.Print.Library int fontStyle = (MyFont.WindowsFont.Bold ? iTextSharp.text.Font.BOLD : 0) + (MyFont.WindowsFont.Italic ? iTextSharp.text.Font.ITALIC : 0); iTextSharp.text.Font itextFont = Volian.Svg.Library.Svg.GetFont(fontFace, MyFont.WindowsFont.Size, fontStyle, System.Drawing.Color.Black); float hdrwidth = itextFont.BaseFont.GetWidthPoint(Text, MyFont.WindowsFont.Size); + if (_OrigStr != null) hdrwidth = itextFont.BaseFont.GetWidthPoint(_OrigStr, MyFont.WindowsFont.Size); hdrwidth += 5; float yLocation = CalculateYOffset(yPageStart, yTopMargin); Rtf2Pdf.TextAt(cb, IParagraph, XOffset, yLocation, hdrwidth, 100, "", yBottomMargin); diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 21f40e8f..c353ab6d 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -4836,6 +4836,16 @@ namespace Volian.Print.Library // 72 points / inch - 7 inches (about width of page) Width = 72 * 7; } + else if (itemInfo.IsRNOPart && itemInfo.MyActiveSection.ColumnMode != 0 && itemInfo.ActiveFormat.MyStepSectionLayoutData.RNOWidthAltAll != null) + { + // This code was added for AEP. Other code that adjusted RNO widths was only adjusting the RNO widths + // off of the HLS. AEP needed adjusting for all RNOs. + float ovrd = (float)itemInfo.ActiveFormat.MyStepSectionLayoutData.RNOWidthAltAll; + if (ovrd > 0) + Width = ovrd - tabWidth; + if (XOffset + Width > (float)itemInfo.MyDocStyle.Layout.PageWidth) + Width = (float)itemInfo.MyDocStyle.Layout.PageWidth - XOffset - 5; + } else if (itemInfo.IsRNOPart && !((ItemInfo)itemInfo.ActiveParent).IsHigh) { if (itemInfo.ActiveFormat.MyStepSectionLayoutData.RNOWidthAdj != null && !((ItemInfo)itemInfo.ActiveParent).IsInRNO)