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

Browse Source
This commit is contained in:
Kathy Ruffing 2013-01-21 13:53:02 +00:00
parent ee85f979c8
commit 98a5732471
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/Volian.Print.Library/PromsPrinter.cs
View File

@ -172,7 +172,7 @@ namespace Volian.Print.Library
DateTime tStart = DateTime.Now; DateTime tStart = DateTime.Now;
string MSWordFile = null; string MSWordFile = null;
if (section.MyContent.ContentEntryCount == 1) if (section.MyContent.ContentEntryCount == 1)
{ {
MSWordFile = MSWordToPDF.GetDocPdf(section, PrintOverride.TextColor); MSWordFile = MSWordToPDF.GetDocPdf(section, PrintOverride.TextColor);
OnStatusChanged("MSWord converted to PDF " + MSWordFile, PromsPrinterStatusType.MSWordToPDF); OnStatusChanged("MSWord converted to PDF " + MSWordFile, PromsPrinterStatusType.MSWordToPDF);
} }
@ -182,6 +182,12 @@ namespace Volian.Print.Library
{ {
cb.BeginLayer(layer); cb.BeginLayer(layer);
iTextSharp.text.Image image = iTextSharp.text.Image.GetInstance(page); 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); image.SetAbsolutePosition(xOff, yOff);
cb.AddImage(image); cb.AddImage(image);
cb.EndLayer(); cb.EndLayer();

6
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -922,7 +922,11 @@ namespace Volian.Print.Library
PageListCheckOffHeader = PageItemToSvgText(pageItem, pageItem.Token, vf, section); PageListCheckOffHeader = PageItemToSvgText(pageItem, pageItem.Token, vf, section);
break; break;
default: default:
if (token.Contains(@"RO-"))
{
plstr = token.Replace("{","").Replace("}","");
svgGroup.Add(PageItemToSvgText(pageItem, plstr, MySection));
}
if (token.Contains(@"PS-")) if (token.Contains(@"PS-"))
{ {
ProcedureConfig procConfig = section.MyProcedure.MyConfig as ProcedureConfig; ProcedureConfig procConfig = section.MyProcedure.MyConfig as ProcedureConfig;

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

@ -1914,8 +1914,16 @@ namespace Volian.Print.Library
XOffset += xoff; XOffset += xoff;
if (myTab != null) if (myTab != null)
{ {
myTab.XOffset += xoff; if (itemInfo.MyDocStyle.AlignHLSTabWithSect)
if (myTab.MyMacro != null) myTab.MyMacro.XOffset += xoff; {
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;
}
} }
} }
} }