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.
This commit is contained in:
parent
a533c8fc71
commit
95874bd501
@ -60,7 +60,7 @@ namespace Volian.Controls.Library
|
|||||||
string[] lines = txt.Split(breaks, StringSplitOptions.None);
|
string[] lines = txt.Split(breaks, StringSplitOptions.None);
|
||||||
//string lastLine = lines[lines.Length - 1];
|
//string lastLine = lines[lines.Length - 1];
|
||||||
foreach (string line in lines)
|
foreach (string line in lines)
|
||||||
Add(new RtfLine(line));
|
Add(new RtfLine(line.Replace("\\bullet","*")));
|
||||||
}
|
}
|
||||||
public int MaximumWidth
|
public int MaximumWidth
|
||||||
{
|
{
|
||||||
|
@ -201,6 +201,8 @@ namespace Volian.Print.Library
|
|||||||
//}
|
//}
|
||||||
public override void OnEndPage(PdfWriter writer, iTextSharp.text.Document document)
|
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");
|
int profileDepth = ProfileTimer.Push(">>>> OnEndPage");
|
||||||
InitialsPrinted = false;
|
InitialsPrinted = false;
|
||||||
MyPromsPrinter.OnStatusChanged(string.Format("Page {0}", CurrentPageNumber+1));
|
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);
|
ROFSTLookup myLookup = MySection.MyDocVersion.DocVersionAssociations[0].MyROFst.GetROFSTLookup(MySection.MyDocVersion);
|
||||||
string accpgid = accpageid;
|
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);
|
string val = myLookup.GetROValueByAccPagID("<" + accpgid + "." + multiid + ">", MySection.MyDocVersion.DocVersionConfig.RODefaults_setpointprefix, MySection.MyDocVersion.DocVersionConfig.RODefaults_graphicsprefix);
|
||||||
if (!deflt.StartsWith("[") && val != null)
|
if (!deflt.StartsWith("[") && val != null)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user