diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index ec6c0cd8..5329df03 100644 Binary files a/PROMS/Formats/fmtall/BNPP1Newall.xml and b/PROMS/Formats/fmtall/BNPP1Newall.xml differ diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 79302081..2c7caaf9 100644 Binary files a/PROMS/Formats/fmtall/BNPP1all.xml and b/PROMS/Formats/fmtall/BNPP1all.xml differ diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index 34bf7b2b..66f58847 100644 Binary files a/PROMS/Formats/fmtall/BNPP2all.xml and b/PROMS/Formats/fmtall/BNPP2all.xml differ diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index ace6b7e3..a20ce594 100644 Binary files a/PROMS/Formats/fmtall/BNPPalrall.xml and b/PROMS/Formats/fmtall/BNPPalrall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index 75b587dc..0126b237 100644 Binary files a/PROMS/Formats/fmtall/BNPPbckall.xml and b/PROMS/Formats/fmtall/BNPPbckall.xml differ diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml index d958d8ba..c67c9c8d 100644 Binary files a/PROMS/Formats/fmtall/BNPPsamall.xml and b/PROMS/Formats/fmtall/BNPPsamall.xml differ 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 _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 _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)