From e309c4a814f33781256b6d7c05ea2e05e5dc2448 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 27 Mar 2024 14:29:09 -0400 Subject: [PATCH 1/5] F2024-047 - Added (to all BNPP formats) a transition type that can be used to referenced procedure steps containing standard step text. --- PROMS/Formats/fmtall/BNPP1Newall.xml | Bin 230718 -> 231078 bytes PROMS/Formats/fmtall/BNPP1all.xml | Bin 186892 -> 187254 bytes PROMS/Formats/fmtall/BNPP2all.xml | Bin 199432 -> 199794 bytes PROMS/Formats/fmtall/BNPPalrall.xml | Bin 238094 -> 238454 bytes PROMS/Formats/fmtall/BNPPbckall.xml | Bin 166246 -> 166606 bytes PROMS/Formats/fmtall/BNPPsamall.xml | Bin 171376 -> 171736 bytes PROMS/VEPROMS.CSLA.Library/Format/ENums.cs | 3 ++- .../DisplayTransition.cs | 9 +++++++-- 8 files changed, 9 insertions(+), 3 deletions(-) diff --git a/PROMS/Formats/fmtall/BNPP1Newall.xml b/PROMS/Formats/fmtall/BNPP1Newall.xml index 468b33e066e86ff973a501e84d7fe01d48f7c1d0..9097498a9f0c0c22ba73d337ab728f109a281b71 100644 GIT binary patch delta 168 zcmdnj#kZ`Nuc3u;3sc91=@U*e=}e1c;+Sr6mPurK+)gG1;cA9ph7yKUh5`l!h7cfK z!B8??aR-yUHHI)lEl`ODSa~8t9zzO4B0~|7RKQ|@;5jD6>F*9O=}q6an@Mc?gB?t4 i{LTy+44Di$KpjOuYw{*L%1KT?(8A2Jz2^ecrY!(r{VwDH delta 19 bcmZ41%eSwKuc3u;3sc91?H?{OZQB9>SRe_H diff --git a/PROMS/Formats/fmtall/BNPP1all.xml b/PROMS/Formats/fmtall/BNPP1all.xml index cb366256195718766dc898d4eb4da0ddcc702e63..16f08b8f7d1b4f9d98642e6f9548df08f89d8ed9 100644 GIT binary patch delta 162 zcmeC#!u@RYSi%SR diff --git a/PROMS/Formats/fmtall/BNPP2all.xml b/PROMS/Formats/fmtall/BNPP2all.xml index 047aca34d2f206ccc8d2998627975327144442ae..e86d43a4275fcc3b4265cf6b24bc0ed92993c1b8 100644 GIT binary patch delta 164 zcmeB}#`9?gPeTji7A6km=>jrLdW@#i7xFPlPk+G8q##_)5X?}*kjhZNpui9Uq$?Oo zrpxm%$=YI(V5kKu(g15nWXNMkVMt^s0+I??j4%{rQk-5O%%nGco-C8t^g2N%HhyP@ b42DdG9H5ROphbDp9hWf5Zs$>E`tuwBC0r%4 delta 18 Zcmew~gQsH}PeTji7A6km!uRbMUqcJy7N(H$=@*Kbbfz1nG09BN%Vkm!u4V{kC}ButC}2=v2m#U+3?n$zRsnT)5eOJ$OpzOI;wYq~)J6OX7P kLk?o@`n>5QM5WZNUknYKriGjG!Z03Qh}kN^Mx delta 28 kcmex%jIZwqUqcJy7N(H$=?Yy;EbRv>n6@9NVBV$$0I+%sivR!s diff --git a/PROMS/Formats/fmtall/BNPPbckall.xml b/PROMS/Formats/fmtall/BNPPbckall.xml index 15195ae0109703cb93e881019f8d917844027366..e1ff52874c51ac79748aa552a2d21c37a208f21b 100644 GIT binary patch delta 170 zcmaDhiR;`{u7(!IElhPPlRqf4O;co2o4()>Bgb?NaVC-JGo+XlgsT~X8A=#Z844H_ z7(#$_1w+Ync@ZXgTMS`_TA&gQu<}HPJcbm8M1~?Dseow!gXZ*)%1pk~YowXDrtjlt k;+bxz!ot<8 delta 19 bcmX>%mFw9gu7(!IElhPP+n=d2y+{E7R#FIE diff --git a/PROMS/Formats/fmtall/BNPPsamall.xml b/PROMS/Formats/fmtall/BNPPsamall.xml index 1e3215b320fcf22dc8b696819ddd3bbdf760be8b..955bb9b477d1d04a4dc8be52f3768f77f85e7013 100644 GIT binary patch delta 160 zcmeyci|fW-u7)j)Y#*mzc+IH8XgdAiO-AeK4v!dF_)8d4844H_7(#$_1w+Yn#k-8M z(>DNRtkGl`YJsXW7=jr}7!n!s7*c>_5s*{>i=ddnpgCReCZqB6hKGz&({1iBicOEZ f$;ig<%#gv5$&droQv|dtZ?Yqw Date: Wed, 27 Mar 2024 16:12:00 -0400 Subject: [PATCH 2/5] F2024-048 - Robinson requested that we use a hard space in the page number part of transitions that include page numbers. Made this change generic because it doen't make sence to break a page number on to the next line all by itstelf. --- PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index 82072c38..627f335b 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1227,7 +1227,9 @@ namespace VEPROMS.CSLA.Library case 0: break; default: - tb.Append(string.Format(" (Page {0})", tb._ToItem.PageNumber + 1)); + //F2024-048 use a hard space (\\u160;) instead of a space in the page number text + // to keep that text together on the page + tb.Append(string.Format(" (Page{0}{1})", "\\u160;", tb._ToItem.PageNumber + 1)); break; } } -- 2.47.2 From 64bdb9fb76e86093052b46f772c9468fb55aefe3 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Thu, 28 Mar 2024 09:03:03 -0400 Subject: [PATCH 3/5] B2024-017-Fix-BNPP-Table-Arrows --- .../VEPROMS.CSLA.Library/Config/ROFSTLookup.cs | 18 +++++++++++------- .../VEPROMS.CSLA.Library/Extension/AuditExt.cs | 4 ++-- .../Extension/DisplayText.cs | 4 +++- .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 6 +++--- .../VEPROMS.CSLA.Library/Extension/ROFSTExt.cs | 2 +- PROMS/Volian.Controls.Library/DisplayRO.cs | 4 ++-- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 4 ++-- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index 2a1ed189..79bcf3bf 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -285,18 +285,16 @@ 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, ItemInfo MyItemInfo = null) + public static string ROConvertSymbols(string retval, bool arr1, bool arr2) { - // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || - // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue - if (MyItemInfo == null || MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue) + if (arr1) { 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) + if (arr2) { retval = retval.Replace("<=", @"\u8804?"); // Less than or Equal retval = retval.Replace(">=", @"\u8805?"); // Greater than or Equal @@ -492,7 +490,7 @@ namespace VEPROMS.CSLA.Library return rc; } - public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols) + public string GetTranslatedRoValue(string roid, bool DoCaret, bool DoDOSSuperSubScript, bool convertRoSymbols, ItemInfo myiteminfo) { roid = FormatRoidKey(roid, true); @@ -504,7 +502,13 @@ namespace VEPROMS.CSLA.Library retval = ReplaceUnicode(retval, DoCaret); // 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. - if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval); + + //(_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || + // _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)) + bool arrows1 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue; + bool arrows2 = myiteminfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue; + + if (convertRoSymbols) retval = ROFSTLookup.ROConvertSymbols(retval, arrows1, arrows2); retval = ConvertFortranFormatToScienctificNotation(retval); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs index b449193e..856f91f7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/AuditExt.cs @@ -1616,7 +1616,7 @@ namespace VEPROMS.CSLA.Library foreach (ContentRoUsage ro in cont.ContentRoUsages) { RoUsageInfo rou = RoUsageInfo.Get(ro.ROUsageID); - string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); + string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp); ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID); @@ -1844,7 +1844,7 @@ namespace VEPROMS.CSLA.Library ROFSTLookup mylookup = myRoFst.GetROFSTLookup(tmp.ContentItems[0].MyProcedure.MyDocVersion); foreach (RoUsageInfo rou in tmp.ContentRoUsages) { - string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); + string myvalue = mylookup.GetTranslatedRoValue(rou.ROID, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, tmp.ContentItems[0].ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, tmp.ContentItems[0]); ROFSTLookup.rochild rocc = mylookup.GetRoChild(rou.ROID); int mytype = rocc.type; ctmp.FixContentText(rou, myvalue, mytype, myRoFst); diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index 5adba7a0..32b18364 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -694,10 +694,12 @@ namespace VEPROMS.CSLA.Library // B2017-147: backquotes should be translated to degrees for edit/print: newvalue = newvalue.Replace("`", @"\'b0"); // B2023-037: Handle <=, >=, +-, -> and <- symbols. If the format has flags to convert these RO symbols, it + bool arrows1 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue; + bool arrows2 = _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue; // is done here so that output (print & edit/view) has symbol, not 2 characters. if (!_MyItemInfo.IsTable && (_MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue || _MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue)) - newvalue = ROFSTLookup.ROConvertSymbols(newvalue, _MyItemInfo); + newvalue = ROFSTLookup.ROConvertSymbols(newvalue, arrows1, arrows2); 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 821aa997..2c9acd6e 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -908,7 +908,7 @@ namespace VEPROMS.CSLA.Library { string oldText = this.MyContent.Text; - string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); + string roval = lookup.GetTranslatedRoValue(rousage.ROID, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, this.ActiveSection.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, this); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); this.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, this); @@ -964,7 +964,7 @@ namespace VEPROMS.CSLA.Library ROCheckCount++; string oldText = itemInfo.MyContent.Text; - string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); + string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, sectionInfo); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, origROFst, itemInfo); @@ -1186,7 +1186,7 @@ namespace VEPROMS.CSLA.Library // B2023-037: loading print text, resolve the RO symbols 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); + string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, itemInfo.IsTable && GTLT || GLTArrows, itemInfo); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo); } diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs index 113edc89..01c43a22 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ROFSTExt.cs @@ -722,7 +722,7 @@ namespace VEPROMS.CSLA.Library { foreach (ItemInfo ii in roUsg.MyContent.ContentItems) { - string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); + string val = newLookup.GetTranslatedRoValue(padroid, ii.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, ii.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, ii); content.FixContentText(roUsg, val, roch.type, origROFstInfo, true); if (content.IsDirty) diff --git a/PROMS/Volian.Controls.Library/DisplayRO.cs b/PROMS/Volian.Controls.Library/DisplayRO.cs index a439510b..9378fd7a 100644 --- a/PROMS/Volian.Controls.Library/DisplayRO.cs +++ b/PROMS/Volian.Controls.Library/DisplayRO.cs @@ -903,9 +903,9 @@ namespace Volian.Controls.Library // Pad to 16 to store in the RoUsage table. string padroid = ROFSTLookup.FormatRoidKey(roc.roid, true); string linktxt = string.Format(@"#Link:ReferencedObject: {0} {1}", padroid, MyROFST.RODbID); - + // Resolve symbols and scientific notation in the RO return value - string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); + string valtxt = MyROFSTLookup.GetTranslatedRoValue(padroid, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyRTB.MyItemInfo); MyRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, selectedChld.value, linktxt, padroid, MyROFST.RODbID)); } diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 5bbbeeee..241f1db6 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -563,7 +563,7 @@ namespace Volian.Controls.Library string linktxt = string.Format(@"#Link:ReferencedObject: {0} {1}", padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID); // Resolve symbols and scientific notation in the RO return value string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, - false); //ConvertSymbolsAndStuff(selectedChld.value); + false, MyStepRTB.MyItemInfo); //ConvertSymbolsAndStuff(selectedChld.value); MyStepRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, myvalue, linktxt, padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID)); } private void SaveROWithAnnotation_Click(object sender, EventArgs e) @@ -580,7 +580,7 @@ namespace Volian.Controls.Library string padroid = (myroid.Length <= 12) ? myroid + "0000" : myroid; string linktxt = string.Format(@"#Link:ReferencedObject: {0} {1}", padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID); // Resolve symbols and scientific notation in the RO return value - string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false); //ConvertSymbolsAndStuff(selectedChld.value); + string valtxt = MyLookup.GetTranslatedRoValue(padroid, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, MyStepRTB.MyItemInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, false, MyStepRTB.MyItemInfo); //ConvertSymbolsAndStuff(selectedChld.value); MyStepRTB.OnRoInsert(this, new StepRTBRoEventArgs(valtxt, myvalue, linktxt, padroid, MyLookup.MyDocVersionInfo.DocVersionAssociations[0].MyROFst.MyRODb.RODbID)); } private void NoROFound_Click(object sender, EventArgs e) -- 2.47.2 From 50f18ff803eda8119ae765f45ac75a9f1d708db6 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Thu, 28 Mar 2024 10:50:41 -0400 Subject: [PATCH 4/5] B2024-017-fix-BNPP-Table-Arrows --- PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 2c9acd6e..2c145421 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -1184,9 +1184,10 @@ namespace VEPROMS.CSLA.Library if (sectionInfo != null) { // B2023-037: loading print text, resolve the RO symbols - 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, itemInfo); + + bool GTLT = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertGTELTEPMinROValue; + bool GLTArrows = !itemInfo.IsTable && sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseDashGreaterLessThenForArrowsInROValue; + string roval = lookup.GetTranslatedRoValue(rousage.ROID, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta, sectionInfo.ActiveFormat.PlantFormat.FormatData.SectData.UseTildaPoundCharsForSuperSubScriptInROValues, GTLT || GLTArrows, itemInfo); ROFSTLookup.rochild roch = lookup.GetRoChild(rousage.ROID); itemInfo.MyContent.FixContentText(rousage, roval, roch.type, rofstinfo, itemInfo); } -- 2.47.2 From e45422755f76ada16e0ed44fd2f258bd76fb9911 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 1 Apr 2024 14:32:26 -0400 Subject: [PATCH 5/5] =?UTF-8?q?B2024-019=20-=20BNPP=20-=20Allow=20the=20us?= =?UTF-8?q?e=20to=20select=20a=20sub-step=20that=20has=20a=20bullet=20inst?= =?UTF-8?q?ead=20of=20a=20number/letter=20step=20tab,=20when=20using=20the?= =?UTF-8?q?=20{Step=20Text}=20transitions.=20=20Also=20don=E2=80=99t=20sho?= =?UTF-8?q?w=20any=20Tables=20in=20the=20tree=20view=20to=20select=20the?= =?UTF-8?q?=20step=20to=20link=20to.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs | 12 ++++++++++-- PROMS/Volian.Controls.Library/DisplayTransition.cs | 11 +++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs b/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs index 45d3da41..d29e4595 100644 --- a/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs +++ b/PROMS/VEPROMS.CSLA.Library/VEObjects/VETreeNode.cs @@ -199,9 +199,12 @@ namespace VEPROMS.CSLA.Library LoadChildren(true); } private bool _allParts = true; - public virtual void LoadChildren(bool allParts) + private bool _excludeTablesFigsEqu = false; // used for inserting Step Text transitions (BNPP) + public virtual void LoadChildren(bool allParts, bool excldTablesFigEq = false) { _allParts = allParts; + // B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions + _excludeTablesFigsEqu = excldTablesFigEq; if (!_ChildrenLoaded) { this.Nodes.Clear(); @@ -262,6 +265,10 @@ namespace VEPROMS.CSLA.Library if (!skipIt) { VETreeNode tmp = new VETreeNode(o, _allParts); + // B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions + bool isTableFigEqu = tmp.Text.Equals("Table") || + tmp.Text.Equals("Figure") || + tmp.Text.Equals("Equation"); if (o.HasChildren) { if (o is PartInfo) @@ -279,7 +286,8 @@ namespace VEPROMS.CSLA.Library tmp._ChildrenLoaded = true;// Reset the children loaded flag if (lastWasSection) this.Nodes.Insert(0, tmp); - else + // B2024-019 don't show Tables, Figures, or Equations in step tree when inserting Text Transitions + else if (!_excludeTablesFigsEqu || !isTableFigEqu) this.Nodes.Add(tmp); // if last thing was section & this is step, do insert - i.e. so that steps go before sections. lastWasSection = (o is PartInfo && (o as PartInfo).PartType == E_FromType.Section); diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index f2e46267..163cabb0 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -901,7 +901,8 @@ namespace Volian.Controls.Library // F2024-047 BNPP standard Text transition - pass True to LoadChildren to load all children. E_TransUI etm = (E_TransUI) _CurItemFrom.ActiveFormat.PlantFormat.FormatData.TransData.TransTypeList[_TranFmtIndx].TransUI; bool loadAllChildren = ((etm & E_TransUI.StepAllChildren) == E_TransUI.StepAllChildren); - tn.LoadChildren(loadAllChildren); + bool excludeTableFigEqu = loadAllChildren; // don't show Tables, Figures, or Equations in step list + tn.LoadChildren(loadAllChildren, excludeTableFigEqu); } private void cbTranSects_SelectedIndexChanged(object sender, EventArgs e) { @@ -1341,7 +1342,13 @@ namespace Volian.Controls.Library return; } // B2015-170 - don't allow a transition to step that is not sequential - if ((toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered)) + // B2024-019 - but allow if TranFmt only contains {Step Text} + // - Calvert uses {Step Text} but also includes step number + // - Barakah (BNPP) uses just {Step Text} to link to standard text + bool onlyStepText = false; + if (listBoxTranFmt.Text.Contains("{Step Text}") && !listBoxTranFmt.Text.Contains("{First Step}")) + onlyStepText = true; + if (!onlyStepText && (toItem != null &&!toItem.IsNumbered) || (rangeItem != null && !rangeItem.IsNumbered)) { FlexibleMessageBox.Show("For transitions containing step references, the transition must be to a numbered or lettered step.", "Cannot add transition to a non-sequential step", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); -- 2.47.2