Compare commits
No commits in common. "74594adcdb05a7bcc9d0387b13956cf4a9448720" and "9c6fb2e12d8894f57613ccd03b4f0425ccb022b0" have entirely different histories.
74594adcdb
...
9c6fb2e12d
Binary file not shown.
@ -3624,27 +3624,25 @@ namespace Volian.Controls.Library
|
||||
string eopnum = section.MyProcedure.MyContent.Number;
|
||||
if (eopnum.ToUpper().Contains(@"<U"))
|
||||
{
|
||||
// C2021-064 If we are processing the EOP number or an ROLookUp in the pagelist, then strip out the Parent/Child unit tokens
|
||||
// so that we are left with just the EOP number. This is used along with Parent/Child RO Values (in RO Editor)
|
||||
if ((token.Equals("{EOPNUMROLU}") || token.Equals("[EOPNUMROLU]")))
|
||||
{
|
||||
// copied Rgex from DisplayText and modifed to remove the Parent/Child Unit information
|
||||
// i.e. <U>, <U-ID>, <U-NAME>, <U-TEXT>, <U-NUMBER>, <U-OTHERID>, <U-OTHERNAME>, <U-OTHERTEXT>, <U-OTHERNUMBER>
|
||||
// F2023-078 - for Vogtle Units 3 & 4 Alarms - also remove dash after unit number
|
||||
eopnum = Regex.Replace(eopnum, @"\<U\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<U\>", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)ID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)TEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
// B2021-148 remove space character after "OTHER"
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERTEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
}
|
||||
else
|
||||
eopnum = section.MyProcedure.DisplayNumber;// B2021-066: found and fixed during proc pc/pc work
|
||||
// C2021-064 If we are processing the EOP number or an ROLookUp in the pagelist, then strip out the Parent/Child unit tokens
|
||||
// so that we are left with just the EOP number. This is used along with Parent/Child RO Values (in RO Editor)
|
||||
if ((token.Equals("{EOPNUMROLU}") || token.Equals("[EOPNUMROLU]")))
|
||||
{
|
||||
// copied Rgex from DisplayText and modifed to remove the Parent/Child Unit information
|
||||
// i.e. <U>, <U-ID>, <U-NAME>, <U-TEXT>, <U-NUMBER>, <U-OTHERID>, <U-OTHERNAME>, <U-OTHERTEXT>, <U-OTHERNUMBER>
|
||||
eopnum = Regex.Replace(eopnum, @"\<U\>", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)ID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)TEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
// B2021-148 remove space character after "OTHER"
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERID)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNAME)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERTEXT)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)OTHERNUMBER)\>(-|\\u8209\?)", "", RegexOptions.IgnoreCase);
|
||||
}
|
||||
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}"))
|
||||
@ -3749,10 +3747,8 @@ namespace Volian.Controls.Library
|
||||
// Note that each Alarm is defined as its own RO in the Referenced Object database, with multiple return values
|
||||
// to define the Window ID, Alarm, Source, Setpoint, etc. for example.
|
||||
string pltok = pageItem.Token;
|
||||
bool bDoUnderline = true; // F2023-078 new logic to also support Vogtle Units 3 & 4 Alarms - flag to underline pagelist text used as a tag/title
|
||||
while (pltok.Contains("RO_Lookup("))
|
||||
{
|
||||
bDoUnderline = false;
|
||||
int idxstart = pltok.IndexOf("RO_Lookup(");
|
||||
int idxend = pltok.Substring(idxstart).IndexOf(")");
|
||||
string ROLookupstr = pltok.Substring(idxstart, idxend + 1);
|
||||
@ -3818,14 +3814,11 @@ namespace Volian.Controls.Library
|
||||
// Nothing else is on this page list item, so use "continue" to jump to the next pagelist item as nothing gets printed for this item
|
||||
if (!pageItem.ROLkUpMatch && pageItem.ROLkUpInEditor)
|
||||
{
|
||||
// F2023-078 (displaying Alarm Point Table RO information on the edit screen)
|
||||
// New logic is simplified to support both BNPP and Vogtle Units 3 & 4 alarms
|
||||
if (bDoUnderline)
|
||||
if (lastRow < pageItem.Row)
|
||||
{
|
||||
if (lastRow != -1)
|
||||
strAlrmPtTableInfo.Append("\r\n");
|
||||
pltok = pltok.TrimEnd(':');
|
||||
strAlrmPtTableInfo.Append(string.Format("\\ul {0}\\ulnone : ", pltok));
|
||||
strAlrmPtTableInfo.Append(string.Format("\\ul {0}\\ulnone : ",pltok));
|
||||
lastRow = (int)pageItem.Row;
|
||||
}
|
||||
else
|
||||
|
||||
@ -1913,8 +1913,6 @@ i = 0;
|
||||
{
|
||||
// copied Rgex from DisplayText and modifed to remove the Parent/Child Unit information
|
||||
// i.e. <U>, <U-ID>, <U-NAME>, <U-TEXT>, <U-NUMBER>, <U-OTHERID>, <U-OTHERNAME>, <U-OTHERTEXT>, <U-OTHERNUMBER>
|
||||
// F2023-078 - for Vogtle Units 3 & 4 Alarms - also remove dash after unit number
|
||||
eopnum = Regex.Replace(eopnum, @"\<U\>(-|\\u8209\?)", string.Empty, RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<U\>", string.Empty, RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)ID)\>(-|\\u8209\?)", string.Empty, RegexOptions.IgnoreCase);
|
||||
eopnum = Regex.Replace(eopnum, @"\<(U(-|\\u8209\?)NAME)\>(-|\\u8209\?)", string.Empty, RegexOptions.IgnoreCase);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user