From bda5a54754a4309b9c61e4655a266e06af38c8d0 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 3 Jan 2024 17:43:38 -0500 Subject: [PATCH] F2023-112 added format flag for full section number in step tab - for background format --- PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 65092 -> 65260 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 166182 -> 169638 bytes PROMS/Formats/genmacall/VEGPBck.svg | Bin 9628 -> 9628 bytes .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 3 ++- .../Format/PlantFormat.cs | 8 ++++++++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 2e1c10b3584a760f9533a9d1769c08c1642d81f0..fd0a094bcf1fd935120f7bddb68a27e4f70366e7 100644 GIT binary patch delta 175 zcmX@|hxyH4<_%Mf8BHf&HNFqEN~A(g?E zA&;SiA(NqqA$2mNt|+6zkV9v%r(vv6s-2?!u3^&^V delta 111 zcmaF!m-)ya<_%Mf87(JYH%1s^UFEkyfC%zmf=%hvKC)$kC|JyfiH|$v3r};@z#_i4(Bs3#^rI7l zO|F(vLO~2uqh>jL=e{nyNClfOHqj+kvoMvQEn*?e6S;hs#0k&laK;B=#L3}$Q8vnX zRDD`>4jE;{7FG|kq&w21C`~x}h0-RYp|omax{QppcMT0BEfTZ~y=R diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 110e2b15..d27ac719 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4972,7 +4972,8 @@ namespace VEPROMS.CSLA.Library // Otherwise, just return the section tab. // Before checking for anything, if the DisplayNumber starts with 'ATTACHMENT ', don't use that in the Section // prefix for the tabstring. - string attNum = ActiveSection.DisplayNumber.ToUpper().StartsWith("ATTACHMENT ") ? ActiveSection.DisplayNumber.Substring(11) : ActiveSection.DisplayNumber; + // F2023-112 - added flag to use entire section number in the step tab - Vogtle 3&4 Background format (VEGPBckStp) + string attNum = (ActiveSection.DisplayNumber.ToUpper().StartsWith("ATTACHMENT ") && !FormatStepData.TabData.UseEntireSectionNum) ? ActiveSection.DisplayNumber.Substring(11) : ActiveSection.DisplayNumber; Match m = Regex.Match(attNum, @"[a-zA-Z]"); // for alpha, use non-touched displaynumber int indx = -1; if (m.Success) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index b35ee527..d0ff57e7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -6611,6 +6611,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _NoTrim, "TabData/@NoTrim"); } } + private LazyLoad _UseEntireSectionNum; + public bool UseEntireSectionNum + { + get + { + return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum"); + } + } } #endregion