From 4f68414a8a3866874e5baf373fbcbeee4355696b Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Fri, 22 Mar 2024 12:56:36 -0400 Subject: [PATCH] B2023-110-Symbols-in-tables --- PROMS/Formats/fmtall/BNPP1Newall.xml | Bin 230412 -> 230718 bytes PROMS/Formats/fmtall/BNPP1all.xml | Bin 186890 -> 186892 bytes PROMS/Formats/fmtall/BNPP2all.xml | Bin 199430 -> 199432 bytes PROMS/Formats/fmtall/BNPPalrall.xml | Bin 238092 -> 238094 bytes PROMS/Formats/fmtall/BNPPbckall.xml | Bin 166244 -> 166246 bytes PROMS/Formats/fmtall/BNPPsamall.xml | Bin 171374 -> 171376 bytes .../frmVersionsProperties.Designer.cs | 671 +++++++++--------- .../frmVersionsProperties.cs | 10 + .../frmVersionsProperties.resx | 18 + .../Config/ROFSTLookup.cs | 26 +- .../Extension/DisplayText.cs | 6 +- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 4 +- 12 files changed, 389 insertions(+), 346 deletions(-) diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index 1e86a983be3a037b813893ceb88d1c826a6a2454..468b33e066e86ff973a501e84d7fe01d48f7c1d0 100644 GIT binary patch delta 156 zcmeC_;M>>5x51*F-HjoUA%~%O^7~fN=AicWpmxUXLG4VR{CRm9xEK^*aJt}SCPn#B z20sQ*h7h1&H3N+82W0s&I5D^~1WjLfg-My!n8BREbo#^3OwN-pbm%Y|PTv^9tUY}~ w6qCgCf@e%zj0)2i-eS_-p74*Ui)DJjO(vG9kang|{@a5%nRl^lH@M5hw*mk#_YWWd diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index 48fa3d86f2c53a44a289d3a00dbc337db267f1d1..cb366256195718766dc898d4eb4da0ddcc702e63 100644 GIT binary patch delta 30 mcmeC$!rilld&8xe$s)o6lTSqRG{1>ye-p#F{Y?y$TrB|5=nXai delta 26 icmeC#!rirnd&8xe$t}@R&F^B`-^DO)e;30fR|^2EvJ5-` diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index 5c07739bc080ef08385e186d4b32fad44423d572..047aca34d2f206ccc8d2998627975327144442ae 100644 GIT binary patch delta 26 icmZph#?vv4XTvY=$$4Hf%_2VSB0h}UMSPe(?E?UhYYIaE delta 27 jcmeB}#?v;9XTvY==|{dW3N-WhwDb5dZs+k~`m+xJq)iJh diff --git a/PROMS/Formats/fmtall/BNPPalrall.xml b/PROMS/Formats/fmtall/BNPPalrall.xml index 932a023d737308f921ac5f79c831bddf46980c2a..d785ad41ef616d13aa946a1da202b19957c097ee 100644 GIT binary patch delta 34 pcmeA#e-p_F#7x`YL^3OQ000;*4@Lk0 delta 30 kcmeA>!q;=H-$gP4G1K;Uk<1Dn0NsTRhX4Qo diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index 658518a26903ef6c56581accb41fc6f91dd67a56..15195ae0109703cb93e881019f8d917844027366 100644 GIT binary patch delta 34 qcmaDdiR;-Ut_>>o>~0K+3^@$NlLhTWo9*n|?d%!1+u1Xzc>w^*iwZ>m delta 30 mcmaDhiR;NEt_>>olSP~aCd=4yH9Oe1JJ>UBcd%zt^8x^_4GFgZ diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml index c67c9c8d0e354ea35c17d808701fac1566e73f20..1e3215b320fcf22dc8b696819ddd3bbdf760be8b 100644 GIT binary patch delta 26 icmaF2i|fNKt_{nyCiiH{G#}7vKcL09{eTwJx*`CsjtlJo delta 26 icmeyci|gGkt_{nyCLhriXx^dKzC(*~`wlIp9Yp}J> 415, 17 + + 415, 17 + + + 643, 17 + Allows you to specify the default format to use for all procedures in this set. @@ -210,9 +216,21 @@ Check "Show Default Settings" to display the "default" duplexing setting (below 817, 17 + + 17, 65 + + + 817, 17 + 118, 17 + + 118, 17 + + + 17, 17 + 17, 17 diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index 656bbd98..2a1ed189 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -285,16 +285,24 @@ namespace VEPROMS.CSLA.Library #region ROTextConvertMethods // B2023-037: Handle <=, >=, +-, -> and <- symbols. Convert to unicode for output, i.e. print and edit/view (when editing // step, will show as 2 characters, not unicode, unless ro inserted when code replaced link text with unicode. - public static string ROConvertSymbols(string retval) + public static string ROConvertSymbols(string retval, ItemInfo MyItemInfo = null) { - retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow - retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow - retval = retval.Replace("->", @"\u8594?"); // Right Arrow - retval = retval.Replace("<-", @"\u8592?"); // Left Arrow - retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal - retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal - retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus - retval = retval.Replace("+-", @"\'b1"); // plus minus + // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || + // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue + if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue) + { + retval = retval.Replace("\\u8209?>", @"\u8594?"); // Right Arrow + retval = retval.Replace("<\\u8209?", @"\u8592?"); // Left Arrow + retval = retval.Replace("->", @"\u8594?"); // Right Arrow + retval = retval.Replace("<-", @"\u8592?"); // Left Arrow + } + if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue) + { + retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal + retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal + retval = retval.Replace("+\\u8209?", @"\'b1"); // plus minus + retval = retval.Replace("+-", @"\'b1"); // plus minus + } return retval; } #endregion diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index c573b818..5adba7a0 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -695,9 +695,9 @@ namespace VEPROMS.CSLA.Library newvalue = newvalue.Replace("`", @"\'b0"); // B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it // is done here so that output (print & edit/view) has symbol, not 2 characters. - if (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || - _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue) - newvalue = ROFSTLookup.ROConvertSymbols(newvalue); + if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || + _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)) + newvalue = ROFSTLookup.ROConvertSymbols(newvalue, _MyItemInfo); if (gg != newvalue) text = text.Substring(0, myIndex) + newvalue + text.Substring(myIndex + myLength); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 0252740d..821aa997 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1184,7 +1184,9 @@ namespace VEPROMS.CSLA.Library if (sectionInfo != null) { // B2023-037: loading print text, resolve the RO symbols - string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues,sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue|| sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue); + bool GTLT = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue; + bool GLTArrows = sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue; + string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, itemInfo.IsTable && GTLT || GLTArrows); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo); }