From 0a71a28480e20fbc67a33775dcafa9de52be438c Mon Sep 17 00:00:00 2001 From: John Date: Fri, 1 Nov 2013 20:56:15 +0000 Subject: [PATCH] Logic to adjust the position of the End message when the page is compressed. Logic to properly handle whether a procedure title should be uppercased --- PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 8 ++++++-- PROMS/Volian.Print.Library/vlnParagraph.cs | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 956c6045..5c1deafb 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1051,7 +1051,9 @@ namespace Volian.Print.Library int tlen = (token.Contains("COVERPROCTITLE"))?(int)section.ActiveFormat.PlantFormat.FormatData.ProcData.CoverTitleLength : (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength; //float linelen = (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength * (float)pageItem.Font.CPI / 12; float linelen = tlen * (float)pageItem.Font.CPI / 12; - plstr = SplitTitle(svgGroup, pageItem, section.MyProcedure.MyContent.Text.ToUpper(), (int)linelen, token, plstr); //,rowAdj); + string title = section.MyProcedure.MyContent.Text; + if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title = title.ToUpper(); + plstr = SplitTitle(svgGroup, pageItem, title, (int)linelen, token, plstr); //,rowAdj); break; case "{COVERTITLE1}": case "[COVERTITLE1]": @@ -1059,7 +1061,9 @@ namespace Volian.Print.Library case "[COVERTITLE2]": int ctlen = section.ActiveFormat.PlantFormat.FormatData.ProcData.CoverTitleLength ?? 0; float coverlinelen = ((ctlen == 0) ? (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength : ctlen) * (float)pageItem.Font.CPI / 12; - plstr = SplitCoverTitle(svgGroup, pageItem, section.MyProcedure.MyContent.Text, (int)coverlinelen, token, plstr);//, rowAdj); + string title1 = section.MyProcedure.MyContent.Text; + if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title1 = title1.ToUpper(); + plstr = SplitCoverTitle(svgGroup, pageItem, title1, (int)coverlinelen, token, plstr);//, rowAdj); break; case "{TITLE&UNIT}": case "[TITLE&UNIT]": diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 182daf0c..2bd23786 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -990,6 +990,8 @@ namespace Volian.Print.Library { // If the flag is 0 or 1, just put the end message out right below this vlnParagraph: float msg_yLocation = CalculateYLocation(yPageStart - YBottomMost, yTopMargin); + if (MyPageHelper.YMultiplier < 1) + msg_yLocation += 4;// Robinson - if the page is compressed, we need this adjustment. // the following is for IP3 - it was commented out so that an update could be put on // before this was tested.