diff --git a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs index fe7edb61..5e27e6ab 100644 --- a/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs +++ b/PROMS/ReferencedObjects/Exe/RefObj/ROEditor/ROEditor.cs @@ -418,7 +418,7 @@ namespace ROEditor // NOTE: not doing the "Using System.Threading;" statement at beginning of file because it conflicts with the declaration of the "Timer" variable System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en-US"); - // The data path the was passed in. + // The data path the was passed in. DbConnectPath = PassedInPath; // Setup the context menu @@ -2844,7 +2844,8 @@ namespace ROEditor } else { - newt=null; + mnutitle = Regex.Replace(mnutitle, @"\\u([0-9]{1,4})\?", m => Convert.ToChar(int.Parse(m.Groups[1].Value)).ToString()); // RO Editor add symbols C2022 + newt =null; success = myrodb.RODB_WriteRO((VlnXmlElement)roTreeView.SelectedNode.Tag); if (success==true && mnutitle != "") roTreeView.SelectedNode.Text = mnutitle; //B2021-077 make sure mnutitle has text or it will clear the node's title in the tree } diff --git a/PROMS/XYPlots/frmXYPlot.cs b/PROMS/XYPlots/frmXYPlot.cs index a98497ab..461fed05 100644 --- a/PROMS/XYPlots/frmXYPlot.cs +++ b/PROMS/XYPlots/frmXYPlot.cs @@ -2,13 +2,14 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Drawing.Printing; -using System.Drawing.Imaging; -using System.Text; -using System.Windows.Forms; using System.Diagnostics; +using System.Drawing; +using System.Drawing.Imaging; +using System.Drawing.Printing; using System.IO; +using System.Text; +using System.Text.RegularExpressions; +using System.Windows.Forms; using VG; //using XYPlots; @@ -21,6 +22,10 @@ namespace XYPlots public frmXYPlot(string title,string xyPlot) { InitializeComponent(); + + title = Regex.Replace(title, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); // C2022-003 RO Symbols. Convert unicode to character. + xyPlot = Regex.Replace(xyPlot, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : ""); // C2022-003 RO Symbols. Convert unicode to character. + int pstart = xyPlot.IndexOf("<