From 71cef595ca587a62558550c34302bcde6292f16d Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 8 Jan 2024 15:46:05 -0500 Subject: [PATCH 1/2] F2023-112 format setting to remove -B from background proc num (used in title box) --- PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 57514 -> 57664 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 82856 -> 89352 bytes .../VEPROMS.CSLA.Library/Format/PageStyles.cs | 9 +++++++++ .../Volian.Print.Library/VlnSvgPageHelper.cs | 6 ++++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index e60327aafc3b1660a86312fd5c7e8bffb971bdf7..fb525e7788689b24c795ae2ef742e4b9146ef7e4 100644 GIT binary patch delta 348 zcmZ2=komwN<_#Q7{4Nan49N_o47m)c40#MCn+2J6uQhZ5a!MEy88R7ifUFb-1%_ZC zKb4^X$O6d~1GN+ZWeb3!nLq>bCZE3{IeAAp&t|?2Czxav7(&3(xeTsAGgE*{@)*(? zY#EdobQzo`AKZ~TdDn%!&C51l5g@~+{5z(b&m6f$tSx0HY{;->^Z6Ui%%nSRbN(G` F764jmS*8F0 delta 91 zcmX?bh2$ diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index 00010106598653495b82eb0edd5f33b838a9d3dd..0cd1d0bd35359f67fee94b29529916a456073d40 100644 GIT binary patch delta 3311 zcmeHKO=uHQ5T0d|O}3?f$;PyeiQC{GNJz6unpRNI>Y)nS)O+(;z3jdiv>e3;ziIyJZKMA(2E|N-Tc_y{FnqG9?G)2@9oZ;_r2Nq zzBhaKs{Yy&{rp45D#9KZr(*z4!C4rAL5NasEdGGG!m?fnpjZFO9)dA?AwoBqjZC!2!;SL4$xl?zQ3xBX@Jg&*<=zUO?`kz+?BB9g~6sg6^jkd{j6sqIP}Jz zh2vm71c30f0g%vbwBe&;tvJs$QwE(1n(-1f<7$;DGdV9 znK!W(S2tFeSSgR?5YUoKz(TNwzyCW5X67iwfVC8)J*z99Sn(k^1U*zK`S9bCt&)gk zJ!fDzlY&Y^tDT7JyP-xP^6rKb$W>C&-S8qSQ2`a^-YfS6f0&9W5$_wKs{WKw-9O1^ z`p=ck;zmu9%E<)ZgC9C|@fWqbO-wJ=I$GkKW95=vq*Rpu6-KClkHTqcMd|-RF6mvc q7gyi*VQltt{MoIQbAK^yn_VWeIc`C0WDYcxWIR>3@YKb8w)_Ty^IK5> delta 189 zcmeC!#k!)Mb;CNw&Bqv9m>Eqb`?4ONd`2#9a*(*lZL$Nm#AF%esL4vAAoDLxPLhL}EwFiwik;Bre`cR* iColNxw>e>JP7aiz#=bp4lhKPG%4Or*F6YkpN)!Of`AR|n diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs b/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs index 01a13d65..df70d5d1 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PageStyles.cs @@ -202,6 +202,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _TextColor, "@TextColor"); } } + // F2023-112 Vogtle Units 3 & Backgrounds - trim the ending "-B" from the procedure number (used in title box of page header) + private LazyLoad _TrimEnding; + public string TrimEnding + { + get + { + return LazyLoad(ref _TrimEnding, "@TrimEnding"); + } + } #endregion #region Override ToString public override string ToString() diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 2af728b3..c5c2e949 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1934,8 +1934,6 @@ i = 0; else eopnum = section.MyProcedure.DisplayNumber;// B2021-066: found and fixed during proc pc/pc work } - - } // B2022-066 the "{PREDELIMEOPNUM}" token was not being processed because there was a space after the "{" if (token.Equals("{PREDELIMEOPNUM}")) @@ -1947,6 +1945,10 @@ i = 0; if (idx < eopnum.Length) eopnum = eopnum.Substring(0, idx); } + + if (pageItem.TrimEnding != null) + eopnum = eopnum.TrimEnd(pageItem.TrimEnding.ToCharArray()); + plstr = plstr.Replace(token, eopnum); //svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token.Replace(token, eopnum))); //svgGroup.Add(PageItemToSvgText(pageItem, pageItem.Token.Replace(token, section.MyProcedure.MyContent.Number))); -- 2.47.2 From 8e4c42ac0541467f19f5094d3f6bc69762bd43b0 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 10 Jan 2024 12:17:53 -0500 Subject: [PATCH 2/2] F2023-112 - adjust length of text next to purpose in background format, other format adjustments and cleanup --- PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 57664 -> 57728 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 89352 -> 89436 bytes PROMS/Volian.Print.Library/vlnParagraph.cs | 15 ++++++++++----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index fb525e7788689b24c795ae2ef742e4b9146ef7e4..f24011a682b5b7fd98fd853967efe53fdf051f53 100644 GIT binary patch delta 251 zcmX?bh`He~^M-52lPer#CL5)FnS9PIVDbiew#^QvZ3*1!TzPb8bn@K+R_aC$IBVn|vWg zXYv6DvB@1VC7X@Xo-l5H78k(=mf=cMgUWb;^a5qum?sywuuX0d<(O<^?l9SIoxmg? zzRe0*7Xnxn8FU$RH$OZ-osk*Hn4GvLb8_DWq0M*pNC>0LJ=~(ddCJ8DoXkcH7L(uK bcVsl&Jo9!i3!~ZOxA&bHEjAlI;AaE?(~Dx- delta 256 zcmZoT%zWSw^M-52lZ|5JCf_p`*kq!?0-`6GJeut1Ew|asauz#K&WllD@<(HLMup9> zj#HU78@Nnk1d1w5ewV5O6#HoG$~f6!2FvCEcRpsQ?#+JQcLXMjd3j6@h}j0w&8)zn zFxl5_{pMe>9_(PLH>qlqH@Henmhf_$3}ge15=?7no?Iu&H94IzdH-J>atB79&o%jRnr_i-|t iFj!31e_+pS%3!(q=Ivk>MvKY151bjzHWxnNX9NIIM`IuW diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index 0cd1d0bd35359f67fee94b29529916a456073d40..c0bb1ab403d268a95719f854008522589472a5cf 100644 GIT binary patch delta 93 zcmV-j0HXhhx&_?21+XAUB_IG)0B-W`7`)j9*Zb5L^(GP+<;}pj;M{&Y2XmKxN4H3K1W; delta 63 zcmV-F0Kos;x&?^31+XAUlR%adlR%gnlaSt4lR&rzlaNykv*t+l8 diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 8e12335e..18692067 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -6612,7 +6612,7 @@ namespace Volian.Print.Library int? bxIndx = itemInfo.IsStep ? itemInfo.FormatStepData.StepLayoutData.STBoxindex : null; float? widOvrd = 0; float xwid = 0; - if (itemInfo.IsStep && itemInfo.MyHLS != null && UseTemplateWidthOrXOff(itemInfo) && (xwid = GetWidthOrStartFromTemplate(itemInfo, formatInfo, true)) > 0) + if (itemInfo.IsStep && itemInfo.MyHLS != null && UseTemplateWidthOrXOff(itemInfo) && (xwid = GetWidthOrStartFromTemplate(itemInfo, formatInfo, true)) > 0) widOvrd = xwid; else widOvrd = itemInfo.FormatStepData == null ? null : itemInfo.FormatStepData.WidthOverride == null ? null : @@ -6671,10 +6671,15 @@ namespace Volian.Print.Library } if ((widOvrd ?? 0) != 0) { - Width = (float)widOvrd; - // if there's a box, we may need to do an adjustment on the width, if the tab data was changed - // so don't return. - if (bxIndx == null) return; + //F2023-112 Vogtle Units 3 & 4 Backgrounds. Don't use override width of paragraph when it's off of TitleWithTextRight + // We need to allow the code to calculate the width of that paragraph for this case (later in this function) + if (!(itemInfo.ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.Vogtle3and4BackgroundFormat && itemInfo.MyParent.FormatStepData != null && itemInfo.MyParent.FormatStepData.Type == "TitleWithTextRight")) + { + Width = (float)widOvrd; + // if there's a box, we may need to do an adjustment on the width, if the tab data was changed + // so don't return. + if (bxIndx == null) return; + } } float tabWidth = (myTab == null) ? 0 : myTab.Width; if (itemInfo.IsHigh) -- 2.47.2