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

Development #20

Merged
djankowski merged 2 commits from Development into master 2023-07-13 11:28:03 -04:00
Conversation 0 Commits 2 Files Changed 3 +30 -21
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

9
PROMS/Volian.Controls.Library/EditItem.cs
View File

@ -3630,6 +3630,8 @@ namespace Volian.Controls.Library
{
// 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);
@ -3747,8 +3749,10 @@ 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);
@ -3814,10 +3818,13 @@ 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)
{
if (lastRow < pageItem.Row)
// 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 != -1)
strAlrmPtTableInfo.Append("\r\n");
pltok = pltok.TrimEnd(':');
strAlrmPtTableInfo.Append(string.Format("\\ul {0}\\ulnone : ", pltok));
lastRow = (int)pageItem.Row;
}

2
PROMS/Volian.Print.Library/VlnSvgPageHelper.cs
View File

@ -1913,6 +1913,8 @@ 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);