From 8e4c42ac0541467f19f5094d3f6bc69762bd43b0 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 10 Jan 2024 12:17:53 -0500 Subject: [PATCH] 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)