From 64e52f5f6874916357b094883fb68d68fe1787ed Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Wed, 2 Nov 2022 14:37:49 +0000
Subject: [PATCH] C2022-021: resolve greater/less than or equal & plus/minus to
 symbols in ROs C2022-021: Barakah resolve greater/less than or equal &
 plus/minus to symbols in ROs

---
 PROMS/Formats/fmtall/BNPP1Newall.xml          | Bin 229262 -> 229326 bytes
 PROMS/Formats/fmtall/BNPP1all.xml             | Bin 185538 -> 185602 bytes
 PROMS/Formats/fmtall/BNPP2all.xml             | Bin 197108 -> 197172 bytes
 PROMS/Formats/fmtall/BNPPalrall.xml           | Bin 239882 -> 239946 bytes
 PROMS/Formats/fmtall/BNPPbckall.xml           | Bin 164118 -> 164182 bytes
 PROMS/Formats/fmtall/BNPPsamall.xml           | Bin 171310 -> 171374 bytes
 .../Format/PlantFormat.cs                     |   9 +++++++++
 PROMS/Volian.Controls.Library/StepRTB.cs      |   8 ++++++++
 8 files changed, 17 insertions(+)

diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml
index ec6c0cd8c9fd0f791a80fff5704de8ff98e7ac94..5329df03f6a07533f3d8d08e956f583eae70a739 100644
GIT binary patch
delta 62
zcmeDC&wK7a?}oU>$pQ_0%I*vy46Y15U^0Ngmm!lOk0FS`pCODPks*hnlp&SDw%Nb2
O-M^7>yMH5-{XYOj;}P8e

delta 22
ecmX^2pSSNn?}oU>=6Q|n^BNhq&ue5d_y+)q;|o&&

diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml
index 793020815abc71e884a40d889c2b65c4e60c7d1d..2c7caaf9e419231aa35e3ac7110cd0f97ac56306 100644
GIT binary patch
delta 62
zcmX@KlDlaY_lA2hlP5&;$-6UzFt{@KfXM&`UxrMEJcb|!e}*uIM1~xO(#eHF!p-+$
P+V90MZoe19^rRdBQx_Af

delta 22
ecmZo##eHZc_lA2h&2q8ra<Pot<zkthlmh^82MH(u

diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml
index 34bf7b2b3f84e4837da328f59342b2ff6430d76e..66f5884726c39f4229dba9c44deb11f7c45543cd 100644
GIT binary patch
delta 59
zcmey;%(JD1XM>23ygNe(gDZm%m<(X>Wyoa6V+dmKX9#0RWXNGCoo;xMQMj4Sr=87*
LaXXt2)4Qzz#ybyl

delta 22
dcmdne!t<q>XM>1ObBIrSh!5lT5Fe%oTLEd=2@wDQ

diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml
index ace6b7e3267eb24549e6d757add10e75ee30c4a4..a20ce594df94ddd865552fa422a46033faf9ecce 100644
GIT binary patch
delta 71
zcmeCW#CPfv--bDn^6m^F46Y15U^0Ngmm!lOk0FS`pCODPks*hnboxduCgI5rF)Wj-
WBDk98M7Ga~WCUWS?Q<fT^ZWtgniW$3

delta 26
gcmX?giLdJt--bDn&37W(??f^JG1K-tk<5Ai0JjqinE(I)

diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml
index 75b587dc62ad0e9df5a92ba7ed5e4c2710314585..0126b237b24a953d9a0277d0e73fda65d3651ba5 100644
GIT binary patch
delta 67
zcmbQ%#C5HSYr{Lc$=7TJ<lPxU7+e{Az+?b}FGD6n9zzg=KSLNpB0~;C>GZ|}jIxvO
U*b6js*|&4qGj8XyXX0@J0HDqiNdN!<

delta 22
dcmccC#5JvnYr{LcW<C3MJ$uIOdiG2jP5^3M2i5=p

diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml
index d958d8ba4999c1e27b8104b5b83801a8ef7b2bbb..c67c9c8d0e354ea35c17d808701fac1566e73f20 100644
GIT binary patch
delta 60
zcmZ3ti|gGkt_=sY6x|s@7+e{Az+?b}FGD6n9zzg=KSLNpB0~;CDMRXHK{4UxEn4kc
Nv>3N<(PFA90ssb<5Y7Mq

delta 19
bcmaF2i)-C3t_=sYnzY-r8MkRO<rM({TN4N2

diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
index 6042141c..c31901fe 100644
--- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
@@ -2707,6 +2707,15 @@ namespace VEPROMS.CSLA.Library
 				return LazyLoad(ref _UseTildaPoundCharsForSuperSubScriptInROValues, "@UseTildaPoundCharsForSuperSubScriptInROValues");
 			}
 		}
+		// C2022-021 will convert ">=" to the greater than or equal symbol, "<=" to the less than or equal symbol and plus/minus for RO return values
+		private LazyLoad<bool> _ConvertGTELTEPMinROValue;
+		public bool ConvertGTELTEPMinROValue
+		{
+			get
+			{
+				return LazyLoad(ref _ConvertGTELTEPMinROValue, "@ConvertGTELTEPMinROValue");
+			}
+		}
 		// C2019-043 will convert "->" to the right arrow symbol and "<-" to the left arrow symbol for RO return values
 		private LazyLoad<bool> _UseDashGreaterLessThenForArrowsInROValue;
 		public bool UseDashGreaterLessThenForArrowsInROValue
diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs
index 0cbf310a..8140e31d 100644
--- a/PROMS/Volian.Controls.Library/StepRTB.cs
+++ b/PROMS/Volian.Controls.Library/StepRTB.cs
@@ -982,6 +982,14 @@ namespace Volian.Controls.Library
 				retval = retval.Replace("\\u8209?>", GetAddSymbolTextForROs(@"\u8594?")); // Right Arrow
 				retval = retval.Replace("<\\u8209?", GetAddSymbolTextForROs(@"\u8592?")); // Left Arrow
 			}
+			// C2022-021 convert a "<=" to a less than or equal symbol, a ">=" to a greather than or equal symbol and +- to a 
+			//	plus/minus symbol in ROs
+			if (MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)
+			{
+				retval = retval.Replace("<=", GetAddSymbolTextForROs(@"\u8804?")); // Less than or Equal
+				retval = retval.Replace(">=", GetAddSymbolTextForROs(@"\u8805?")); // Greater than or Equal
+				retval = retval.Replace("+\\u8209?", @"\'b1");   // plus/minus - note - is stored as \u8209 and plus/minus is < 256, i.e. handled differently
+			}
 			return retval;
 		}
 		public void InsertRO(string value, string link)