Merge pull request 'Development' (#752) from Development into master

Merging from dev into master after successful testing.

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
 			}

PROMS/Volian.Controls.Library/StepRTB.cs

@@ -1400,15 +1400,25 @@ namespace Volian.Controls.Library
 			if (SelectionLength > 0)HandleDeleteKeyWithSelectedText(new KeyEventArgs(Keys.None), null);
 			int position = SelectionStart;
 			SelectionLength = 0;
+			// B2026-036  fixed issue where numbers after a dash character (in an RO return value) were trucated
+			//            Needed to add a space after the \f0 in the string replace below. RTF was getting confused
+			//            when there are number right after the \f0.  Note also remove the space charcter after
+			//            the \f1 command, as it is not needed since the \u commdn follows it.
+			//            Here is the old code prior to when the foreach loop was added to handle symbols in RO value:
+			//
+			//            linkValue = linkValue.Replace("\\u8209?", "\\f1\\u8209?\\f0 "); // dash character
+			//            linkValue = linkValue.Replace("\\u9586?", "\\f1\\u9586?\\f0 "); // backslash symbol
+			//            linkValue = linkValue.Replace("\\u916?", "\\f1\\u916?\\f0 "); // delta symbol
 
 			var pattern = @"\\u([0-9]{1,4})\?"; // RO Editor add symbols C2022 - 003
 			foreach (Match match in Regex.Matches(linkValue, pattern, RegexOptions.IgnoreCase))
 			{
-				linkValue = linkValue.Replace(match.Value, "\\f1 " + match.Value + "\\f0");
+				linkValue = linkValue.Replace(match.Value, "\\f1" + match.Value + "\\f0 ");
 			}
 
 			linkValue = linkValue.Replace(@"{", @"\{");
 			linkValue = linkValue.Replace(@"}", @"\}");
+
 			SelectedRtf = @"{\rtf1\ansi" + FontTable + @"{\colortbl ;\red255\green0\blue0;\red0\green0\blue255;}\v" + FontSize + @" <START]\v0\cf1 " + linkValue + @"\cf0\v " + linkUrl + @"[END>\v0 }";
 			this.SelectionLength = 0;
 			this.SelectionStart = position;

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("<<G"); //  find the starting Plot Command
 			xyPlot = xyPlot.Substring(pstart); // set val to the start of the plot commands
 			_XYPlot =xyPlot;