diff --git a/PROMS/Volian.Svg.Library/SvgScale.cs b/PROMS/Volian.Svg.Library/SvgScale.cs index c4ab0260..6a8b551b 100644 --- a/PROMS/Volian.Svg.Library/SvgScale.cs +++ b/PROMS/Volian.Svg.Library/SvgScale.cs @@ -100,11 +100,6 @@ namespace Volian.Svg.Library { float yOffset = 0; // = (cb.PdfWriter.CurrentPageNumber -1) * .8F * cb.PdfDocument.PageSize.Height; float myY = yOffset + cb.PdfDocument.PageSize.Height - _Scale * (y.GetSizeInPixels(DPI) - YLowerLimit); - if (myY < .1F * cb.PdfDocument.PageSize.Height) - { - //cb.PdfDocument.NewPage(); - myY += .8F * cb.PdfDocument.PageSize.Height; - } return myY; } public float YY(SvgMeasurement y) diff --git a/PROMS/Volian.Svg.Library/iTextSharp.cs b/PROMS/Volian.Svg.Library/iTextSharp.cs index d39baf59..7867bc75 100644 --- a/PROMS/Volian.Svg.Library/iTextSharp.cs +++ b/PROMS/Volian.Svg.Library/iTextSharp.cs @@ -580,7 +580,6 @@ namespace Volian.Svg.Library iTextSharp.text.Font font = FontFactory.GetFont(Font.Name, BaseFont.IDENTITY_H, true, fontSize, fontStyle, new Color(FillColor)); Phrase ph = BuildPhrase(text, fontSize, fontStyle, font); - ColumnText ct = new ColumnText(cb); float x = scale.X(X); float w = 0; // chk.GetWidthPoint(); @@ -819,6 +818,18 @@ namespace Volian.Svg.Library get { return _CurrentPageNumber; } set { _CurrentPageNumber = value; } } + private bool _OnFoldoutPage = false; + public bool OnFoldoutPage + { + get { return _OnFoldoutPage; } + set { _OnFoldoutPage = value; } + } + private bool _CreatingFoldoutPage = false; + public bool CreatingFoldoutPage + { + get { return _CreatingFoldoutPage; } + set { _CreatingFoldoutPage = value; } + } public SvgPageHelper(Svg mySvg) { _MySvg = mySvg; @@ -846,12 +857,29 @@ namespace Volian.Svg.Library } public override void OnEndPage(PdfWriter writer, Document document) { - base.OnEndPage(writer, document); - DrawBackground(writer.DirectContentUnder); - DrawPageList(writer.DirectContent); - DrawWatermark(writer.DirectContentUnder); - if(DoZoomOMatic)DrawZoomOMatic(writer.DirectContent); - CurrentPageNumber++; + if (!OnFoldoutPage) + { + base.OnEndPage(writer, document); + if (!CreatingFoldoutPage) + { + DrawBackground(writer.DirectContentUnder); + DrawPageList(writer.DirectContent); + DrawWatermark(writer.DirectContentUnder); + if (DoZoomOMatic) DrawZoomOMatic(writer.DirectContent); + } + CurrentPageNumber++; + } + else + { + if (!CreatingFoldoutPage) + { + DrawBackground(writer.DirectContentUnder); + DrawPageList(writer.DirectContent); + DrawWatermark(writer.DirectContentUnder); + if (DoZoomOMatic) DrawZoomOMatic(writer.DirectContent); + CurrentPageNumber++; + } + } } private PdfReader _BackgroundReader = null; public PdfReader BackgroundReader