Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Development #269

Merged
djankowski merged 6 commits from Development into master 2024-03-15 09:33:57 -04:00
Conversation 0 Commits 6 Files Changed 5 +15 -1
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4292581840 - Show all commits

BIN
PROMS/Formats/fmtall/VEGP2all.xml
View File

Binary file not shown.

BIN
PROMS/Formats/genmacall/VEGP2.svg
View File

Binary file not shown.

5
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@@ -4556,6 +4556,7 @@ namespace VEPROMS.CSLA.Library
} }
bool isAlpha = tbformat.ToUpper().Contains("ALPHA"); bool isAlpha = tbformat.ToUpper().Contains("ALPHA");
int ordinal = Ordinal; 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. 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 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)); tbformat = tbformat.Replace("{numeric}", LinkedTab.Trim(" .".ToCharArray()).PadLeft(2));
} }
string alpha = useLinked?LinkedTab.Trim():AlphabeticalNumbering(ordinal); 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 // 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")) if (_ActiveFormat.Name =="BGESAM1" &&MyParent != null && MyParent.IsHigh && MyParent.IsStep && MyParent.FormatStepData.TabData.IdentEdit.Contains("ROMAN"))
tbformat = tbformat.Replace("{alpha}", alpha); tbformat = tbformat.Replace("{alpha}", alpha);
@@ -4629,7 +4631,8 @@ namespace VEPROMS.CSLA.Library
tbformat = tbformat.Replace("{numeric}", stpTab); tbformat = tbformat.Replace("{numeric}", stpTab);
} }
else 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 (tbformate != null)
{ {
if (useLinked) if (useLinked)

11
PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs
View File

@@ -6635,6 +6635,17 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _UseEntireSectionNum, "TabData/@UseEntireSectionNum"); 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<bool> _TrimSeqTabValue;
public bool TrimSeqTabValue
{
get
{
return LazyLoad(ref _TrimSeqTabValue, "TabData/@TrimSeqTabValue");
}
}
} }
#endregion #endregion