From ac091a7d266bc99f1681f6737677b8fbfa64e2e7 Mon Sep 17 00:00:00 2001 From: mschill Date: Wed, 28 May 2025 14:15:21 -0400 Subject: [PATCH 1/2] C2025-021 Add logic to PROMS to support a special High Level Step type that is not printed. --- PROMS/Formats/fmtall/BASEall.xml | Bin 94778 -> 96092 bytes PROMS/Formats/fmtall/WEP2all.xml | Bin 79150 -> 79944 bytes PROMS/Formats/fmtall/WEPBCKall.xml | Bin 56940 -> 57728 bytes PROMS/Formats/fmtall/WEPSAM2all.xml | Bin 76028 -> 76816 bytes PROMS/Volian.Print.Library/vlnParagraph.cs | 17 +++++++++++++++-- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 3078bdbb46912565e7cf67f80000450a464f6b69..af378a3a1f0fdbe7b173aaeac8d7b88934990f72 100644 GIT binary patch delta 611 zcmZXQJ4*vW6ou~~ffz8Dun8D^tf>qp!PpoCThS(11g$skg}A$zhop*%|6ssDNg@6K zNs$l~h4fljSV}5uu@xK7%qF17vNLnn3=KkID_Tf3{v0PAe0?a?Kf-LP7r2v~{ z+u}RI=EPZsh1)vS$R?c%YPGP|5m{8kSHP+Mt7;%VMtr0yH7N3^o5)xcM{S0DG(G-m z)Sw(CK(9mRC{hc15gC`#pehyG2&BXSR1S8qo4`q|MP+0Rm9J9;tvW?fw_zfRvra42 z!UzYM8uSw@F;r|SVV!hUP%VR?V`Pz<_^UX}xozn!iQupMEX3y6sR^-^8)}!sb-?8- zxaOq!JoJaaO5^TW*LEH{nKRUNq%8}SmgS9f6?y6*#(Phixb-r>I1jTuK6>_X=Q7D(zt(y8ZjtMKpSW0H uaX$Rq`riS6@IN8>NHHn@tg>w_PG2!t&F delta 23 fcmccfj&;`))`l&NNkZFGgcw~owx5t^oDvQIe834H diff --git a/PROMS/Formats/fmtall/WEP2all.xml b/PROMS/Formats/fmtall/WEP2all.xml index 8f5e5743cba63d2909835827a03dd17c44159199..880a7aa56e21979ff7fd536793b0fe18916a2b74 100644 GIT binary patch delta 188 zcmZ4Yisi%ymJP3RCV#M%n>@)|NYIlZkD-hqlc5-hlNfRsQYW7_RGlp6!83VUy3*uH z1`?ACETksy$&i~YmB}@kB~x$mBQBxI8!YT5uXEvIRGR!ZGj;NjR1s4Qa~KpDJb-4V zGh_f+J`AZqTT+4MD=-8zlmJ-;K$gbj|0_fpH7763k(`_mrZV|~rQGC#G@i);;eL~^ VO%$5^z>15NlK}`fKg{tx0RRS{JL3QV delta 14 WcmX@{fo0t*mJP3RHnSACoB#kky$6y2 diff --git a/PROMS/Formats/fmtall/WEPBCKall.xml b/PROMS/Formats/fmtall/WEPBCKall.xml index 7ffb858a3ca438a797b368c0119c4c77275c7bd0..76e45fd4052c4125ed2a436b20f88582c3b413f3 100644 GIT binary patch delta 190 zcmaE}hq>V}^9H8$$qTe(7%e7$)D#xa-Wsh>>> GetRtf"); + int profileDepth = ProfileTimer.Push(">>>> GetRtf"); _RtfSB = new StringBuilder(); DisplayText vlntxt = new DisplayText(itemInfo, E_EditPrintMode.Print, E_ViewMode.View, true, E_FieldToEdit.StepText, false, prefix, suffix, MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces != null); + + //C2025-021 Add logic to PROMS to support a special High Level Step type that is not printed. + if (itemInfo.IsType("InvisibleHigh")) + { + System.Drawing.Font myHighFont = vlntxt.TextFont.WindowsFont; + _RtfSB.Append(AddFontTable(myHighFont)); + _RtfSB.Append("}"); + string rtfHigh = _RtfSB.ToString(); + ProfileTimer.Pop(profileDepth); + return rtfHigh; + } + // C2021-010: Remove trailing returns/spaces & manual page breaks & allow save. if (DisplayText.RemoveTrailingBlankID > 0 && !MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces.Contains(itemInfo.ItemID)) MyPageHelper.MyPromsPrinter.RemoveTrailingHardReturnsAndSpaces.Add(DisplayText.RemoveTrailingBlankID); System.Drawing.Font myFont = vlntxt.TextFont.WindowsFont; From 6e9c7e28e68cec427a7733a172623f176881a6ed Mon Sep 17 00:00:00 2001 From: mschill Date: Wed, 28 May 2025 14:37:14 -0400 Subject: [PATCH 2/2] C2025-021 Add logic to PROMS to support a special High Level Step type that is not printed. Make Inactive by Default --- PROMS/Formats/fmtall/BASEall.xml | Bin 96092 -> 96090 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index af378a3a1f0fdbe7b173aaeac8d7b88934990f72..8ca3756eb07244f11ea212a94c792a3cf220be2f 100644 GIT binary patch delta 26 icmccfj`h|%)`l&NO0ts`PI66e5n~M6-XP0(ClUakC<>(j delta 27 jcmcchj`hwv)`l&NO0v_}aWL{tZxdq-*j^{gcqbA7qwETK