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

For Calvert: remove a tab space if double alphanumeric so tab doesn’t overwrite box line; tabs should be ‘AA’, ‘AB’ rather than ‘AA’, ‘BB’

Browse Source 
Added Bottom continue message margin for RNO column
This commit is contained in:
Kathy Ruffing 2014-04-16 15:18:33 +00:00
parent 6b4f9a4ac3
commit f51573672f
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2818,7 +2818,11 @@ namespace VEPROMS.CSLA.Library
string alpha = AlphabeticalNumbering(ordinal);
tbformat = tbformat.Replace("{alpha}", alpha.ToLower());
tbformat = tbformat.Replace("{alphaWpar}", alpha.ToLower());
tbformat = tbformat.Replace("{ALPHA}", alpha);
if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert && tbformat.Contains("{ALPHA}") && alpha.Length > 1)
tbformat = tbformat.Replace("{ALPHA}. ", alpha+"."); // if double chars, remove one of the space for BGE
else
tbformat = tbformat.Replace("{ALPHA}", alpha);
tbformat = tbformat.Replace("{ALPHAWpar}", alpha);
if (tbformat.ToUpper().Contains("ROMAN"))
{
@ -3299,11 +3303,14 @@ namespace VEPROMS.CSLA.Library
private string AlphabeticalNumbering(int number)
{
string retval = string.Empty;
// originally the code would do double alpha as 'aa', 'ab', 'ac'. This was changed to do 'aa',
// 'bb', 'cc'. The Westinghouse work required this and 16bit was tested and it worked the
// same way as the Westinghouse requirement. The original code to do 'aa', 'ab' was left here,
// commented out, in case a future plant needs it and then should tie it to a format flag.
// Changed logic to support unlimited cases ('aa','aaa','aaaa', etc.)
// BGE requires tabs to be 'AA', 'AB', 'AC'... 'BA', 'BB', 'BC', etc.
if (ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert)
{
if (number > 26) retval += Letter((number - 1) / 26);
retval += Letter(1 + ((number - 1) % 26));
return retval;
}
// Westinghouse and 16bit had 'AA', 'BB', etc. Logic supports unlimited cases ('aa','aaa','aaaa', etc.)
retval = retval.PadRight(1 + ((number-1)/26), Letter(1 + ((number - 1) % 26))[0]);
return retval;
}

13
PROMS/VEPROMS.CSLA.Library/Format/DocStyles.cs
View File

@ -611,6 +611,19 @@ namespace VEPROMS.CSLA.Library
}
}
#endregion
#region MarginR BGE
private LazyLoad<float?> _MarginR;
[Category("Continue Msg")]
[DisplayName("Margin for bottom msg RNO Column (if in both columns)")]
[Description("Margin for bottom msg RNO Column (if in both columns)")]
public float? MarginR
{
get
{
return LazyLoad(ref _MarginR, "@MarginR");
}
}
#endregion
#region Location
[Category("Continue Msg")]
[Description("Bottom Continue Location")]