Removed drawing of circle for debug

remove underline style on font used to output extra blank line
Fixed V.C Summer centerline after End message at bottom of page
This commit is contained in:
John Jenko 2014-01-28 21:30:48 +00:00
parent 6ece6c83ef
commit 8a3c47e8d7
3 changed files with 21 additions and 3 deletions

View File

@ -887,7 +887,7 @@ namespace Volian.Print.Library
public static void DoFoldoutPage(PdfContentByte cb, string str, PdfLayer textLayer) public static void DoFoldoutPage(PdfContentByte cb, string str, PdfLayer textLayer)
{ {
cb.Circle(400, 100, 50); //cb.Circle(400, 100, 50);
PrintTextMessage(cb, "Foldout for: " + str, textLayer); PrintTextMessage(cb, "Foldout for: " + str, textLayer);
cb.PdfDocument.NewPage(); // Temporary for foldout/16bit-32bit page alignment cb.PdfDocument.NewPage(); // Temporary for foldout/16bit-32bit page alignment
//_MyLog.InfoFormat("NewPage 7 {0}", cb.PdfWriter.CurrentPageNumber); //_MyLog.InfoFormat("NewPage 7 {0}", cb.PdfWriter.CurrentPageNumber);

View File

@ -185,20 +185,29 @@ namespace Volian.Print.Library
} }
private void DrawCenterLine(PdfContentByte cb, float xLoc, float yTop, float yBottom) private void DrawCenterLine(PdfContentByte cb, float xLoc, float yTop, float yBottom)
{ {
//iTextSharp.text.Color lineColor = new iTextSharp.text.Color(PrintOverride.OverrideTextColor(System.Drawing.Color.DarkOrange));
cb.SaveState(); cb.SaveState();
if (PageListLayer != null) cb.BeginLayer(PageListLayer); if (PageListLayer != null) cb.BeginLayer(PageListLayer);
cb.SetLineWidth(.95f); cb.SetLineWidth(.95f);
cb.SetColorStroke(new Color(PrintOverride.SvgColor)); cb.SetColorStroke(new Color(PrintOverride.SvgColor));
//cb.SetColorStroke(lineColor);
cb.MoveTo(xLoc, yTop); cb.MoveTo(xLoc, yTop);
float ylast = yTop;
if (_MyGaps != null) if (_MyGaps != null)
{ {
foreach (Gap gap in MyGaps) foreach (Gap gap in MyGaps)
{ {
cb.LineTo(xLoc, gap.YTop); cb.LineTo(xLoc, gap.YTop);
cb.MoveTo(xLoc, gap.YTop - (gap.YTop - gap.YBottom) * YMultiplier); cb.MoveTo(xLoc, gap.YTop - (gap.YTop - gap.YBottom) * YMultiplier);
ylast = gap.YTop - (gap.YTop - gap.YBottom) * YMultiplier;
} }
_MyGaps = null; _MyGaps = null;
} }
// put in for V.C. Summer
// the end message for EOP procedure 15.2 was at the very bottom of the page.
// the remaining center line was drawn past the page boarder. there was no need
// to print it for cases like that
if (ylast > yBottom)
cb.LineTo(xLoc, yBottom); cb.LineTo(xLoc, yBottom);
cb.Stroke(); cb.Stroke();
if (PageListLayer != null) cb.EndLayer(); if (PageListLayer != null) cb.EndLayer();

View File

@ -1610,7 +1610,16 @@ namespace Volian.Print.Library
addExtraSpace = 0; addExtraSpace = 0;
} }
if (addExtraSpace > 0 && MyItemInfo.FormatStepData != null) if (addExtraSpace > 0 && MyItemInfo.FormatStepData != null)
this.PartsAbove.Add(new vlnText(cb, this, " ", " ", 72, yoff, MyItemInfo.FormatStepData.Font)); {
// We need to strip out the underline style from the font before putting out
// the extra line.
VE_Font vf=MyItemInfo.FormatStepData.Font;
E_Style sty = (E_Style)vf.Style;
if ((sty & E_Style.Underline) != 0)
sty ^= E_Style.Underline;
vf = new VE_Font(vf.Family, (int) vf.Size, sty,(float) vf.CPI);
this.PartsAbove.Add(new vlnText(cb, this, " ", " ", 72, yoff, vf));
}
yoff += addExtraSpace; yoff += addExtraSpace;