From 98a5732471f14222b971f548e26cf9487f43f69a Mon Sep 17 00:00:00 2001 From: Kathy Date: Mon, 21 Jan 2013 13:53:02 +0000 Subject: [PATCH] --- PROMS/Volian.Print.Library/PromsPrinter.cs | 8 +++++++- PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 6 +++++- PROMS/Volian.Print.Library/vlnParagraph.cs | 12 ++++++++++-- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 6789c363..2031eed5 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -172,7 +172,7 @@ namespace Volian.Print.Library DateTime tStart = DateTime.Now; string MSWordFile = null; if (section.MyContent.ContentEntryCount == 1) - { + { MSWordFile = MSWordToPDF.GetDocPdf(section, PrintOverride.TextColor); OnStatusChanged("MSWord converted to PDF " + MSWordFile, PromsPrinterStatusType.MSWordToPDF); } @@ -182,6 +182,12 @@ namespace Volian.Print.Library { cb.BeginLayer(layer); iTextSharp.text.Image image = iTextSharp.text.Image.GetInstance(page); + + // the following checks if the content of page is landscape and rotates because we're printing on + // a portrait page. If, at some point, we print a total landscape page, not a mix, this will need + // re-evaluated. + if (page.Height < page.Width) + image.RotationDegrees = 90F; image.SetAbsolutePosition(xOff, yOff); cb.AddImage(image); cb.EndLayer(); diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index e6550f6a..d3c549df 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -922,7 +922,11 @@ namespace Volian.Print.Library PageListCheckOffHeader = PageItemToSvgText(pageItem, pageItem.Token, vf, section); break; default: - + if (token.Contains(@"RO-")) + { + plstr = token.Replace("{","").Replace("}",""); + svgGroup.Add(PageItemToSvgText(pageItem, plstr, MySection)); + } if (token.Contains(@"PS-")) { ProcedureConfig procConfig = section.MyProcedure.MyConfig as ProcedureConfig; diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 99fb2835..a0ac5a60 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1914,8 +1914,16 @@ namespace Volian.Print.Library XOffset += xoff; if (myTab != null) { - myTab.XOffset += xoff; - if (myTab.MyMacro != null) myTab.MyMacro.XOffset += xoff; + if (itemInfo.MyDocStyle.AlignHLSTabWithSect) + { + myTab.XOffset = (float)itemInfo.MyDocStyle.Layout.LeftMargin + (float)formatInfo.PlantFormat.FormatData.SectData.SectionHeader.Pos; + XOffset = myTab.XOffset + myTab.Width; + } + else + { + myTab.XOffset += xoff; + if (myTab.MyMacro != null) myTab.MyMacro.XOffset += xoff; + } } } }