From d2cad3a9f7d342d8d9d96ca3aed70b0bf954390f Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Thu, 4 Apr 2024 11:42:39 -0400 Subject: [PATCH 1/4] F2024-045: BGE format - note/sub-step table overwrites note line --- PROMS/Formats/fmtall/BGEOIall.xml | Bin 141348 -> 141348 bytes PROMS/Formats/fmtall/BGESTPall.xml | Bin 151228 -> 151228 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml index 25a9c01441bcd50c39a2c38ce941e55b7115f6d6..ed699d05d4f80670b7ee347d774a0d0b3d03faaa 100644 GIT binary patch delta 47 pcmZ2-fn&)9j)pCadfBX|3FM#+l{jsy&0kG<{Sk3axP=wE&x!V4O9RC diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml index 6fb9c262e779a79932f91b8ab3265fadd5ad9503..ef860c715276af72e2661fbb6475b45e2d5b5014 100644 GIT binary patch delta 47 pcmdlpmvhft&W0_F5qYep3y&0kGwfPA4-vY+{cL7yX4n6FM#+hg+>y&0kGwfPA4-vY+{cL7*j4rKrU -- 2.47.2 From 776d9891d97e2c853bcea341656d9c6968454c79 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Thu, 4 Apr 2024 15:36:15 -0400 Subject: [PATCH 2/4] F2024-049 F2024-050 Generic EOP Format updates --- PROMS/Formats/fmtall/GENall.xml | Bin 39670 -> 42380 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 229004 -> 228998 bytes .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 5 +++-- .../Format/PlantFormat.cs | 5 +++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/PROMS/Formats/fmtall/GENall.xml b/PROMS/Formats/fmtall/GENall.xml index 92e8e74ec6d295ed7da1e9ba363ab03c9a51c691..2821d29131ae6294328656946378943a107eeaaa 100644 GIT binary patch delta 1374 zcmd^8O=}ZT6ul-SO002`HkqbLo5_e(p(QqHrO`-j+J%bLv`Hz5LX#%_&^U=rVl93Y zico|uDt9Re;>ML&f_Cj%5d8s45PyIRaUorJ-b<`$>e8JIGtB)u_r7!P`|;Ye{?7C& zY3A$8Io9rV^Tvw8Kg~%`hz3X}jV@7^ZsX0-Ns7?|&GBZql}F7ADr|ikO;QojF)Gtd zic=oe6wSk9)O|5jreNIw)>+c{qra86rxmWc7G*D+Wz{i)x*R1C*C|9{()p3)Oz#xB zW#CPsK8<)5_>1rvRFawfB%U7XqXY&#MSW4$C4o|g zB~CXXy;;OX&8_;(Y5dnZ&CxK;A}Z`jU>Wk9wRjfOod-X^=hjU)UdpUi3f66v3s$Q) zhU}c|TtY9=p@6e2;w`ZwsDg(!k;mVh7xx*wIX)n)LqYJoQwKm##pvoV^UF2mUxKpH z<>qtV!AdpoWr$y_+WEb5fTJE~U{ErXq-9K-m5epa15bvZxQ=r5h>cA_H@^wn`HIyI zJzLo4xATYoHjL_&XzRLjWf)5QQBWv64Bj$Q$2l4S7v&wLdcaa+bPW0l?wkD+(CP9X zZvsf^W^c5ic{9uypzokTvtO*4SbCkuPkVX8r$8t-KRh1e2dewnl3b^Gj2f3>id8Sk zl`kSvgkK()pRM`%d%MP0ElwWo>>kqSZhd`f%QZvy=>)QMyca-74M!04*GzTm7NRB;X@Fy)GC^rjgak=aF)wXNbjjsNK8e|hsl!AQiu($Fx<&69SsM|eS delta 93 zcmeA<&Gc<6(}ob{$+w!8P5#ClGTDw<49rerZJKPtCN!CkO>J@>+qB7DsbZ4@ba vV*e&SSuV$Ha)GqM=2r^Gm?l41z%n^Omt*n;C!ftcs*mh}GAx^8attg182%+C diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index da5cca778d69f6a4de55ffaa9e1ec00465a00724..dd2ccec307383e90ef73272bb787eec24cfe533b 100644 GIT binary patch delta 35 qcmeDA%iH#scSD}R^hGzA#3l=v@HNjcXrE!g2*ga=XBaSl@dW@80}e6( delta 35 qcmZqs%iHspcSD}R^l#@G)g}iRvoudKXrE-j2*ga=CmAq*@dW@J%?_ym diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 2c145421..e1634696 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4452,9 +4452,10 @@ namespace VEPROMS.CSLA.Library } } // F2024-037 reset the seq sub-step numbering if the parent is an un-numbered high level step - else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0) + // F2024-049 changed to specify the level via the format file (Generic EOP and Vogtle 3&4) + else if (sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS != null && IsSequential && MyParent != null && MyParent.IsHigh && MyParent.MyTab.Text.Length == 0) { - localPrintLevel--; // since parent is a high level step we only need to go back one level + localPrintLevel = (int)sd.StepSectionLayoutData.ResetSeqNumberingAfterUnnumberedHLS; itmp = (localPrintLevel + PrintBias + OffsetTab) % seqtabs.MaxIndex; } if (!tbformat.Contains(@"{!C")) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 653c3df8..faf65a31 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -4508,8 +4508,9 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _AllowNoteCautionAdd, "@AllowNoteCautionAdd"); } } - private LazyLoad _ResetSeqNumberingAfterUnnumberedHLS; - public bool ResetSeqNumberingAfterUnnumberedHLS + // F2024-049 changed to specify the sub-step level via the format file (Generic EOP and Vogtle 3&4) + private LazyLoad _ResetSeqNumberingAfterUnnumberedHLS; + public int? ResetSeqNumberingAfterUnnumberedHLS { get { -- 2.47.2 From 72eaac478ffaf7ca7feecf759bec65b1965848d6 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Thu, 4 Apr 2024 15:45:44 -0400 Subject: [PATCH 3/4] B2024-021 --- PROMS/Volian.Print.Library/PromsPrinter.cs | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/PROMS/Volian.Print.Library/PromsPrinter.cs b/PROMS/Volian.Print.Library/PromsPrinter.cs index 61b32bc1..82f950c3 100644 --- a/PROMS/Volian.Print.Library/PromsPrinter.cs +++ b/PROMS/Volian.Print.Library/PromsPrinter.cs @@ -701,22 +701,24 @@ namespace Volian.Print.Library { if (File.Exists(outputFileName)) { - String tmpExt = System.IO.Path.GetExtension(outputFileName); - String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName); - String tmpFN = System.IO.Path.GetFileName(outputFileName); - String tmpFNNoExt = System.IO.Path.GetFileNameWithoutExtension(outputFileName); - - var files = new HashSet(Directory.GetFiles(tmpPTH, "*.pdf")); - //string baseName = Path.Combine(scpath, "Screenshot_"); - string filename; - int i = 0; - do + if (!BaselineTesting) { - filename = tmpPTH + @"\" + tmpFNNoExt + "_" + ++i + ".pdf"; - } while (files.Contains(filename)); + String tmpExt = System.IO.Path.GetExtension(outputFileName); + String tmpPTH = System.IO.Path.GetDirectoryName(outputFileName); + String tmpFN = System.IO.Path.GetFileName(outputFileName); + String tmpFNNoExt = System.IO.Path.GetFileNameWithoutExtension(outputFileName); - outputFileName = filename; + var files = new HashSet(Directory.GetFiles(tmpPTH, "*.pdf")); + //string baseName = Path.Combine(scpath, "Screenshot_"); + string filename; + int i = 0; + do + { + filename = tmpPTH + @"\" + tmpFNNoExt + "_" + ++i + ".pdf"; + } while (files.Contains(filename)); + outputFileName = filename; + } } writer = PdfWriter.GetInstance(document, new FileStream(outputFileName, FileMode.Create)); -- 2.47.2 From b0776fb8b7d5595bce4571a6cdc89846b0c5713f Mon Sep 17 00:00:00 2001 From: John Jenko Date: Fri, 5 Apr 2024 09:43:15 -0400 Subject: [PATCH 4/4] F2024-051 Generic EOP Format, page width of Attachment section --- PROMS/Formats/fmtall/GENall.xml | Bin 42380 -> 42380 bytes .../Properties/AssemblyInfo.cs | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/GENall.xml b/PROMS/Formats/fmtall/GENall.xml index 2821d29131ae6294328656946378943a107eeaaa..432f0ac33df49909be00c1ccb5ff90fba7121117 100644 GIT binary patch delta 18 ZcmeA<&D3+6X@lP!W-|t(&4F{QIRQqj2Alu@ delta 18 acmeA<&D3+6X@lRK$$3kfHeZ;thXVjs)d^Ps diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index 66391440..9c0d359f 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,11 @@ using System.Runtime.InteropServices; // Revision DHH (day - no leading zero, two digit hour - military time // // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** -[assembly: AssemblyVersion("2.1.2403.2209")] -[assembly: AssemblyFileVersion("2.1.2403.2209")] +[assembly: AssemblyVersion("2.1.2404.509")] +[assembly: AssemblyFileVersion("2.1.2404.509")] + + + -- 2.47.2