From 93c8844fd20ca98188e945c1f7020802125bd0b8 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Wed, 12 Jul 2023 15:55:55 -0400 Subject: [PATCH] F2023-078 - Alarm Point table in Editor F2023-079 - Adjust Change Bar position on Alarm Point page F2023-080 - fix page header of second page of Alarm Point page F2023-082 - Vogle Alarm format, Span cautions and notes across the page width. Also separate Note/Caution for Front Matter F2023-085 - Vogtle Alarms - Add RO_LookUp calls to pagelist to automatically generate Alarm Point Table F2023-086 - Add a Word section type called "Deleted Alarm Point" for alarm points that were removed --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 76104 -> 89986 bytes PROMS/Volian.Controls.Library/EditItem.cs | 49 ++++++++++-------- .../Volian.Print.Library/VlnSvgPageHelper.cs | 2 + 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 685eb63864d66e49828c1a750e160d69b8b9e8ee..c966fc986a1ffc5785120bb67d895eaf1cc1e26a 100644 GIT binary patch delta 3631 zcmcInZA?>F7(NGX0ij}3%ZC*3f)rR4R!UK-tSKK=Sx^f)HHOGX(1ByvAe-@H9h!|f z#fd(|%Lr3koLfw0G}i>PIcEG}7UC40F`6hrwq*XRD(w7Ob8?Lz+FJr}Y>OU_kRY7fF34WLwKKR?zHM{`j@b)>&L+r9XKmMw z*@#4ci5BNR3_$nntP#e7(Oa?8bj71E ze+fJp;kcVSAH7Qwu{O_PoWpWi8T)|Mu`0Ha)vz=+hb^U59b1R&m@sr_Etb2o&+_LO zIz0gcD^TFlVe!0BS#+HVR$)H$6v5(d9$w4Qh2gfjqo$1xAs%mLXUF&mjHRho>sJJ$)1Hj(`BCV~ z-T=$qL95QaT8KsAD9zDgZKxh67T6$WCgSeO2UzJJD*YYI15kZ57GkbA3ao7m*ru^S zrwlPmXE9lbiNhp9bTzyX>cZ9Qks3Q5%2+gPozE?}7ZNjq)=@~~vRO50qL#hSM7Dxf z<#fM})}zoT`6PIRitYr);ThG5a8?U&*Azp{F;E;&>6NdocKQ>YiLe!~QFxwKL{7_C z1zSe4tY%vfR~bRHM?=?GJFE}?cqSqxKgORVj>2PcLm@eEZJSQ9fj{yMQiX{}qIPk( zdR9$S1I9s9EuBr`q&ibDJPT^+v=s%0VqlFPZ?8QKU6&L6>3Z2+(xZ8LQ@<{LFy~0j z^5d$1HA8A9xqFT(Yx$w)$=Li4hPcKp*VGB)ZlI8!S75;NBU4?Ot)# z=x$9m4w`(AjCxo;8F3N4RYbr>R*NIs!UlyS9&CqhU*t1vcHh`?pN|dqzM9UdK*1g} zh_-;ez%Y;-hOfHaGXRD11$s-zq5nq`3l*mYgPP@`oOYA$in=l=eph zk@TyU8`0OGm%2?{K*E3??Tt}#=Hsn29*uhO?15l3KQhOdsn#fca~btfkxIyNDj#{Y zQhql}m&x3eJSwMUY(1;PordWeWl*ytZXistj2oSw$lraomA|scPr==|;eYi`u5NPs zy~_FpHwxtb=59VIqc12hWK>N&+1=7NIm5oIfC=aJ2q>mf-E&baS$s^A21--#{HkoAY5$hBw%fy3d=t+?l3H)Y9j)v>}q~0(tq*PL4+RUC!aBjL+ zdS4w|rG8ha`${8Q&o)ZmCh>f3m+mF;SyaER(*6h@qf{8_b_ky-&7a1_q~XCLo5sLR z^k<=x+GvhC1Y}bu+@KBu=}O<(Wt3Wy`CQ2n$zy5MQd_r_XyW0LXy6GQ7lXJ%keUqK zsyH-pV~04EpXAc+K>mevKZ2J_MUlJ!TRUwXSvu|v!}Ukj4$8AUKNZ<2Baf4MLU`;; zp~{jjh&*8=Du*;Djt5IuwKN-&C&F~a#P@V~rg9rsdU_|#O;3YTUysIltzOM@3d%8V yT_B_uH8!5vQ5M7h?c8gnElgpTM;ravLElg?>X-|?|IJi zoO?&Vlz;y~=66Pb1zjVl;`xZy1jrMAPO6Fuc@Cg9UnbV3p3{cR3|ueQpwOnkV51sW zo+%`+?}LNT!_!~8TjtK7&KdD;@W$e5xE{Za?{~yI?854%+BiA^Q3J9 zdyZB$fgL7)C+laq6zSoYV&O9ym2~g*N}Rc)$Lq_{+?@cAME}(XGWi)&UkFSlfg=JR zmT0kbK2a{+myKV2q}wmuUqzOkrlgV8(9KyiHCdsm^%RpG_cRRiHa)bVe^L*jq>TSc z3YDTx|Aj9l*5kt03cPhN&U+tbh!MS*qVt2cCeB+9$!E9v7@G<74*$R}c83OzSufkXpnVLM6Io%%hpiG>KO zrd3DuHLw<tukE8~5{ZUp+^0xh5Hg< z5&c(lyek$_drbxOrqD$mR6{8WtL6X&Xh7OYp&z4pLdIM7LNYJ4!2Ml+i3}iXc|T4Mh;gJyx)D%^?`P(gL?pQ=s7P zI!KQ!VI}EOUoV40{C+uf1PnG<(Cz=9A4A}mdKie{FO-3i7doLrO4ahUCO9U6 G==&SRCmg>3 diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs index f3fee107..dd07f3fa 100644 --- a/PROMS/Volian.Controls.Library/EditItem.cs +++ b/PROMS/Volian.Controls.Library/EditItem.cs @@ -3624,25 +3624,27 @@ namespace Volian.Controls.Library string eopnum = section.MyProcedure.MyContent.Number; if (eopnum.ToUpper().Contains(@", , , , , , , , - eopnum = Regex.Replace(eopnum, @"\", "", 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. , , , , , , , , + // F2023-078 - for Vogtle Units 3 & 4 Alarms - also remove dash after unit number + eopnum = Regex.Replace(eopnum, @"\(-|\\u8209\?)", "", RegexOptions.IgnoreCase); + eopnum = Regex.Replace(eopnum, @"\", "", 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}")) @@ -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,11 +3818,14 @@ 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"); - strAlrmPtTableInfo.Append(string.Format("\\ul {0}\\ulnone : ",pltok)); + pltok = pltok.TrimEnd(':'); + strAlrmPtTableInfo.Append(string.Format("\\ul {0}\\ulnone : ", pltok)); lastRow = (int)pageItem.Row; } else diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index 04033a63..6b24b34b 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1913,6 +1913,8 @@ i = 0; { // copied Rgex from DisplayText and modifed to remove the Parent/Child Unit information // i.e. , , , , , , , , + // F2023-078 - for Vogtle Units 3 & 4 Alarms - also remove dash after unit number + eopnum = Regex.Replace(eopnum, @"\(-|\\u8209\?)", string.Empty, RegexOptions.IgnoreCase); eopnum = Regex.Replace(eopnum, @"\", 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); -- 2.47.2