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

B2018-096 AEP 082.002CD Note Box overlapping Step Box

Browse Source
This commit is contained in:
Rich 2018-06-20 14:47:14 +00:00
parent 3cfe32d02d
commit 9cbbd3e9de
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PROMS/Volian.Print.Library/vlnBox.cs
View File

@ -75,7 +75,21 @@ namespace Volian.Print.Library
const string BoxAsteriskTopBottom = "*.*.*. . . .*.*. .*. . "; // fnp const string BoxAsteriskTopBottom = "*.*.*. . . .*.*. .*. . "; // fnp
const string BoxLineTopBottom = "\x2500.\x2500.\x2500. . . .\x2500.\x2500. .\x2500. . "; // fnp const string BoxLineTopBottom = "\x2500.\x2500.\x2500. . . .\x2500.\x2500. .\x2500. . "; // fnp
const string BoxAsteriskTopBotton2 = " .*. . . . . . . .*. . "; // Robinson (CPL) const string BoxAsteriskTopBotton2 = " .*. . . . . . . .*. . "; // Robinson (CPL)
public vlnBox MyParentBox
{
get
{
// B2018-096 AEP 082.002CD Note Box overlapping Step Box
vlnParagraph parent = MyParent.MyParent;
if(parent == null) return null;
if (!parent.MyItemInfo.FormatStepData.BoxIt) return null;
if (parent.PartsContainer == null) return null;
foreach(vlnPrintObject obj in parent.PartsContainer)
if (obj is vlnBox)
return(obj as vlnBox);
return null;
}
}
public override float ToPdf(PdfContentByte cb, float yPageStart, ref float yTopMargin, ref float yBottomMargin) public override float ToPdf(PdfContentByte cb, float yPageStart, ref float yTopMargin, ref float yBottomMargin)
{ {
if (MyBox == null) return yPageStart; if (MyBox == null) return yPageStart;
@ -93,6 +107,8 @@ namespace Volian.Print.Library
myBoxLeftAdj = float.Parse(MyParent.MyItemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj); myBoxLeftAdj = float.Parse(MyParent.MyItemInfo.ActiveFormat.MyStepSectionLayoutData.BoxLeftAdj);
left += myBoxLeftAdj; left += myBoxLeftAdj;
float right = (float)MyParent.MyItemInfo.MyDocStyle.Layout.LeftMargin + (float)(MyBox.End ?? DefEnd); float right = (float)MyParent.MyItemInfo.MyDocStyle.Layout.LeftMargin + (float)(MyBox.End ?? DefEnd);
if (MyParentBox != null)// B2018-096 AEP 082.002CD Note Box overlapping Step Box
right = (float)MyParent.MyItemInfo.MyDocStyle.Layout.LeftMargin + MyParentBox.DefEnd - SixLinesPerInch/2;
right += myBoxLeftAdj; right += myBoxLeftAdj;
iTextSharp.text.Color boxColor = new iTextSharp.text.Color(PrintOverride.OverrideBoxColor(System.Drawing.Color.Black)); iTextSharp.text.Color boxColor = new iTextSharp.text.Color(PrintOverride.OverrideBoxColor(System.Drawing.Color.Black));
cb.SetColorStroke(boxColor); cb.SetColorStroke(boxColor);

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

@ -5330,8 +5330,8 @@ namespace Volian.Print.Library
// else // else
// xoff = XOffset; // xoff = XOffset;
//} //}
// B2018-096 AEP 082.002CD Note Box overlapping Step Box
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 + AdjustHeader + _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);
// Only use SpaceIn property for Cautions or Notes // Only use SpaceIn property for Cautions or Notes
@ -6028,6 +6028,12 @@ namespace Volian.Print.Library
get { return _CheckOffWidth; } get { return _CheckOffWidth; }
set { _CheckOffWidth = value; } set { _CheckOffWidth = value; }
} }
private float _AdjustHeader = 0;// B2018-096 AEP 082.002CD Note Box overlapping Step Box
public float AdjustHeader
{
get { return _AdjustHeader; }
set { _AdjustHeader = value; }
}
public void AdjustWidth(ItemInfo itemInfo, int maxRNO, FormatInfo formatInfo, vlnTab myTab) public void AdjustWidth(ItemInfo itemInfo, int maxRNO, FormatInfo formatInfo, vlnTab myTab)
{ {
int? bxIndx = itemInfo.IsStep ? itemInfo.FormatStepData.StepLayoutData.STBoxindex : null; int? bxIndx = itemInfo.IsStep ? itemInfo.FormatStepData.StepLayoutData.STBoxindex : null;
@ -6154,7 +6160,12 @@ namespace Volian.Print.Library
Width = (float)formatInfo.MyStepSectionLayoutData.WidT - tabWidth; Width = (float)formatInfo.MyStepSectionLayoutData.WidT - tabWidth;
} }
else else
Width = _WidthAdjustBox + (float)bx.TxtWidth - tabWidth; // add 1 to get it to wrap like 16Bit {
float oldWidth = _WidthAdjustBox + (float)bx.TxtWidth - tabWidth; // add 1 to get it to wrap like 16Bit
// B2018-096 AEP 082.002CD Note Box overlapping Step Box
Width = Math.Min(MyParent.Width + MyParent.XOffset - XOffset, oldWidth);
AdjustHeader = (Width - oldWidth)/2;
}
} }
else if ((itemInfo.IsCaution || itemInfo.IsNote) && !itemInfo.FormatStepData.UseOldTemplate) else if ((itemInfo.IsCaution || itemInfo.IsNote) && !itemInfo.FormatStepData.UseOldTemplate)
{ {