From 95874bd501b39d4265ebf561f20689ff67d42d7c Mon Sep 17 00:00:00 2001 From: Rich Date: Wed, 11 Mar 2015 12:38:18 +0000 Subject: [PATCH] Handle rtf token "\bullet" within Grid. Handle the various formats used for analog alarm points (High# and Low#) so that the ROs will be correctly replaced on the cover page. The various formats include either a space or a dash or a underscore followed by High, HI, Low or LO followed by a number. The code will treat all of the formats consistently. --- PROMS/Volian.Controls.Library/OutlineRTFTable.cs | 2 +- PROMS/Volian.Print.Library/VlnSvgPageHelper.cs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/OutlineRTFTable.cs b/PROMS/Volian.Controls.Library/OutlineRTFTable.cs index 5dfe23f9..11c9e827 100644 --- a/PROMS/Volian.Controls.Library/OutlineRTFTable.cs +++ b/PROMS/Volian.Controls.Library/OutlineRTFTable.cs @@ -60,7 +60,7 @@ namespace Volian.Controls.Library string[] lines = txt.Split(breaks, StringSplitOptions.None); //string lastLine = lines[lines.Length - 1]; foreach (string line in lines) - Add(new RtfLine(line)); + Add(new RtfLine(line.Replace("\\bullet","*"))); } public int MaximumWidth { diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index ca506c30..4e5f887c 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -201,6 +201,8 @@ namespace Volian.Print.Library //} public override void OnEndPage(PdfWriter writer, iTextSharp.text.Document document) { + //string path = Volian.Base.Library.vlnStackTrace.StackToStringLocal(3, 1); + //Console.WriteLine("End {0}",path); int profileDepth = ProfileTimer.Push(">>>> OnEndPage"); InitialsPrinted = false; MyPromsPrinter.OnStatusChanged(string.Format("Page {0}", CurrentPageNumber+1)); @@ -1266,7 +1268,7 @@ namespace Volian.Print.Library { ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion); string accpgid = accpageid; - accpgid = accpgid.Replace("-HIGH", "-HI").Replace("-LOW", "-LO").Replace("_HIGH", "-HI").Replace("_LOW", "-LO").Replace(@"\u8209?", "-"); + //accpgid = accpgid.Replace("-HIGH", "-HI").Replace("-LOW", "-LO").Replace("_HIGH", "-HI").Replace("_LOW", "-LO").Replace(@"\u8209?", "-"); string val = myLookup.GetROValueByAccPagID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix); if (!deflt.StartsWith("[") && val != null) {