From d9018c44e7021e76c0474ab2a951b8aa4731e8a1 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 13 Mar 2024 16:32:27 -0400 Subject: [PATCH] F2024-043 Corrected box around second level continuous action sub-step. --- PROMS/Formats/fmtall/VEGP2all.xml | Bin 228180 -> 228228 bytes PROMS/Formats/genmacall/VEGP2.svg | Bin 12094 -> 12094 bytes .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 5 ++++- .../Format/PlantFormat.cs | 11 +++++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index fc0357c2efc779ba58a4e8ee0baa7da38f767901..2ef040f1d6133412cad48a877560c828d88f5a96 100644 GIT binary patch delta 85 zcmccejko1H?}i-n$$A!Y(+z4F*(Mj5C^c^|-@d_|F{DddfgyyUh#`|9mm!!Tm7x&G hOJqo52m_Ki45dI3TLvYt3Lv|k@et#7#zRcOI{}D~7)t;E delta 35 rcmZqq&U@t>?}i-nNfs=V#Y`QVH<@qWWX>4U)oyZ#al6SOrhuIQ6v+<2 diff --git a/PROMS/Formats/genmacall/VEGP2.svg b/PROMS/Formats/genmacall/VEGP2.svg index 3379a5a86e8479110068934eb5d6513f37deb03a..730ace1b5a59f9b62a8cdf6b5641f810370d932a 100644 GIT binary patch delta 14 VcmdlNw=ZtPKW#>%&HuISnE^Kd24nyL delta 14 VcmdlNw=ZtPKW#>{&HuISnE^K#250~P diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 2a321279..4d0c494a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -4556,6 +4556,7 @@ namespace VEPROMS.CSLA.Library } bool isAlpha = tbformat.ToUpper().Contains("ALPHA"); int ordinal = Ordinal; + bool trimSeqValue = FormatStepData.TabData.TrimSeqTabValue; // F2024-043 remove space around SEQ tab value bool useLinked = false; // if this is enhanced, and the LinkedTab isn't numeric, flag to use 'LinkedTab' for the tab. if (ActiveSection != null && ActiveSection.IsEnhancedSection) // C2018-003 fixed use of getting the active section { @@ -4587,6 +4588,7 @@ namespace VEPROMS.CSLA.Library tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2)); } string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal); + if (trimSeqValue) alpha = alpha.Trim(); // F2024-043 trim white around SEQ tab value (for sub-steps) // B2017-211 Roman High Level steps should be followed by Uppercase alpha substeps - This is being limited to Calvert SAMG Format if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN")) tbformat = tbformat.Replace("{alpha}", alpha); @@ -4629,7 +4631,8 @@ namespace VEPROMS.CSLA.Library tbformat = tbformat.Replace("{numeric}", stpTab); } else - tbformat = tbformat.Replace("{numeric}", trimTabStart ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2)); + // F2024-043 added trimSeqValue to trim white around SEQ tab value (for sub-steps) + tbformat = tbformat.Replace("{numeric}", (trimTabStart || trimSeqValue) ? ordinal.ToString() : FormatStepData.AtLeastTwoDigits ? ordinal.ToString().PadLeft(2, '0') : ordinal.ToString().PadLeft(2)); if (tbformate != null) { if (useLinked) diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 2b09e8d5..21a13240 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -6635,6 +6635,17 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum"); } } + // this will remove white space before/after the tab value + // put in for Vogtal Units 3 & 4 formats for continuous action sub-steps + // they have tab value within parenthesis and for a single digit/letter we don't want the white steps before or after it + private LazyLoad _TrimSeqTabValue; + public bool TrimSeqTabValue + { + get + { + return LazyLoad(ref _TrimSeqTabValue, "TabData/@TrimSeqTabValue"); + } + } } #endregion