From f71bd0da19a7951b06d7573b71740db1c9d94634 Mon Sep 17 00:00:00 2001 From: Chris Glavan Date: Wed, 24 Jan 2024 13:51:19 -0500 Subject: [PATCH 01/13] ~Modified font to use Arial --- PROMS/Formats/fmtall/CPDEVall.xml | Bin 26780 -> 33250 bytes PROMS/Formats/fmtall/CPFDEVall.xml | Bin 28904 -> 33772 bytes PROMS/Formats/fmtall/ComPeakFlexall.xml | Bin 60842 -> 64112 bytes PROMS/Formats/fmtall/TUECDEVall.xml | Bin 35924 -> 43388 bytes PROMS/Formats/fmtall/TUECall.xml | Bin 71754 -> 77066 bytes PROMS/Formats/genmacall/cpdev.svg | Bin 5164 -> 5164 bytes PROMS/Formats/genmacall/cpfdev.svg | Bin 5214 -> 5214 bytes PROMS/Formats/genmacall/tuec.svg | Bin 20582 -> 20576 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/CPDEVall.xml b/PROMS/Formats/fmtall/CPDEVall.xml index 49d3f0f5d0aae97dac6436aa16028e34465e842a..8f746a23e55d0cf841da252d6d3db95b2ae9ee91 100644 GIT binary patch delta 1837 zcmbPpk?~P8(}oi~lOu$MCJV5zs24CKG86%E2}3@RR$%Y}(#c?cCXkiKV9TJyV9cO2 zIZ#-9at=$=_yeN7mALPjgn#MC(kBw{c9T9=a0lXHIgM^(XuKSLAfJFY+;k>;DFjSj zpo-s@I+Kqmln^i{Nzr9;oC+axE)b>4PAQ0hZM&5G2&gbpCdNGrl!@`Zl!_NPM=VnP zFgZXqjF>puyihfi5uXz^^d>8*7ZFf#K%Ka9VWH~h$=@_m2$tLDEd&!Uu>o8=0H7rCSnu< ri{Yb_0}P2P<3MUljEGk|!Idk(V(@RDGu3Y}M delta 627 zcmY*WO-lk%6fLy~F*CJEr)m14GR-~|N-FzKhN*0bvWSp^h-ekj(nU~2M5|7;a?vjc zVZdJyA<<%r7A-?shDeKWCHday46WX|mviqq_q^`>}sxL&WjakvmY zs>P}`fRJD(<#a;?g_sqmMicU0R-U)H47g1&P&`h!93n)?jCf-YSZASv<>w|#H7RO3 zs{B=c?7DqM^3L#cINDmmCu=H=9OJ#YSYkPmZ|*PGcL=ly$Qf!ONhT=4EOOjZS&l)W zRm6qchN7KCk>4Q-a=wi>YR%`abB%22j%t0TN5}2G(m#POkEqRj_w5jT)6c-{i>mMv z(G3gk6J`wgH|fTlmqTP=R>y-1F*|zc) F_yeJ3@1g(z diff --git a/PROMS/Formats/fmtall/CPFDEVall.xml b/PROMS/Formats/fmtall/CPFDEVall.xml index 767caa1cb35183084ed112415599cc1bd02b4ec9..37e5c29edd901ccf38868475ec2206f0ef829ee5 100644 GIT binary patch delta 1345 zcmaFyknv4B(}r_QiXjY{3?&RX45r4&-Gp*fJjp=bAxyZ&?5y5b_@!raB`xc`s5%rKdf$dQvNo%Pu*j(5Q`8&e=%t!5LQQ& z8llM?nnjcUF%c0)8bXtoX*x|_phKKm5iR1?HfaSA^v@fuID%?wfNm_)Cf?pB+I|Gh z^wEjJ5no>>Ptpy;DR)ILg`n9r3Idap^h=0QH_5;Yr&VT#X~Y;Y`Iuo8QR=*myoge_ z&&Z7^b$Z5xqZbquD~ySVVxT$$lPrSv##jhVK4vlpXPEh!;R;Ww&8y5bn6PTxB;7Ju hLBwhD1j{tM@>{I%%ipjLz^nh64PO15x$N#40RU)IzB>Q_ delta 427 zcmaFU&h+9T@=}vaRGZ-JU21-C_8D~_IQyA~ z-{e0+T$3NjKAJp3%L^{POgjO}mY94(2WFxjCI^VH0qu~OETHcKS0`qG zV9OW=!Nm=XV0KGPb}&Y$aWg@f8)51NcL$q!*yLSo5H}sLNP(O4%(4W|ma#^tKV_2! z7yo1%1!wcw!~7#LS<1m}@{b6)*pHgSrBYYB1A0AWuE|a&yUApGAz|kd1S>wL~eN z-lX`i$4y%{M)E?$WxSjoZhbgO_PRbqXa+RpTN#E(zBPver+(kbUtb(sYpON7G|y|g zG+~WT^Bnno4u`V}@MXT2XzO4#G!e8$gtr&sjLSl4S=E|yY%r`xPnHq$jBgOD*9ohb zyFgJ7d)_E2led{~`k2r-TzHI^~ zuB<}a(>mN~*5RJb!J>X^Kh3oPwz3jje$>w3M*Vi!Jr;QFG|)OoHkKO%d}H6iT=+Ke zkWksHo6aZ5eX(1>B}ZKh%2)z#q4dQRbQ1y}uR{F~hZ(N$b|=GPEAz1@*%B-^6Ask0 z5k61!{apocZ*FGzhc;W8U5dx+D#V@5C#W38b=tVfGGO`HLKcr@mtGE|t$a%1vkGUf zWW%&t0QK8wYiAg!?TQ~!eE*-_;FdFe9b@pK(=vfzX!K61hxkywn>kG zvz0B(22F3-V;#)K&|`HgF{vtJd?`m%=ank%m+CB4waNMi9_RTa^g;Iu`G~t!7FlxB zissd{cPmfzM7skAJO1lY=zBs-mZ*(RR=t&cX?mD;E0=Y~(J-DEqJes_YMsJ}N!zvamlO!H4h7{7L# z8NGG;7`~{#2Z8MjU#xEV8Bp$%V!6FN{7^dd?DjWs|4R*Tacm7{j5j`0W`9lZU}b@fhOJaj#=leR%FV{PKaM(M*%du4jbQ@kFp?Kb1=Q;o6xB*u;O5^=g& zM~lip4xngyVX+5Sp>m_02bv?^^Ww`4q0d52ZeTckgTny&M=mMhS zffPIw`j1s$_K)N};ls)lG6I}~73lkD3**z76mNerVuowPiu2tD^zKu)u{=Thy%9>? zaQC1(y-UEE4PWDD3#UaTTu^H&+aZuw;9Zd2Uiyw`V zAG*U%B_77-`={qrZGQsl-|biB1*7VFpB$~g`O_SWeY6fuFWD30JvtDxSBbv&jLH0n zWAOcUCZa5b$;h!3bSoBrwKpYC|Laaw-WR{MgkC16zqcZVjF<3hl{`6h>Zvrs z`nC=OR~(q_%T6e7wbZ3cYxroov>sx(ls2W3_P$W3$`5zbw0dy&6~8J!7_Eo>RdwCT zh!u|C98tz2R!ZM7bso$P(AVwc(@)){PhYCkCY4Isl(}B-cwm~M<6BU7(xn=*Fgcyh zL5@Y4j&RpXm+A-aFiIIIWwZ;O8d8^8p6I}(->Y}Ap*Pe|BgOUQn@J^VX+w&eG6T+K4Y_X{ah?9z0a*5E@M! z9=x2(a6(Ld40|SfVN)iz93R){C+aOAKCUN@ThaduqjDcC@4in`y|4t3+COa-PBr`~WAo|x zmr~W4Qir_&o}Mnk+_X0K1?up(>u`6vNs<(IUTDZ<<`(uJA}Py-@iMt@Ut||R@`>v7 zTv2SZEwD83n_uv+^ex|jo9wB>$eh3|9J$1A1&g!vhO0%zj3Bwe&I=pF(2QN_YKjQz zkV1jHp0SxO4qSOiMc3GMioEydKe|ISrWM3&`=)=fA zc|4VIT$-hqm!$aNv$0zGMMWI`$A2=CQdTveK4lN>PMlk)SMJJ&%l}FnLGkXt8zm(H h-Cy&o}0PnJevf6-}HqBuS5}L{=zG0gebu8 zzI9~0#?Qc{cEaztL<$46#83S#l92-H32TrmZySkIu#^^>xoUXaupdXr-g!F z1l1WMPT2YC&kce+9bGZ9>C+_I~KW*60paq^1?U@*H3usxDu~&(n zn}#1$2e`Ny6v>LQ3KcrGmZOVyDJNfVS#Q6IwVI?E& zNMvsdw!Ddj+o?^&!j?DRrL{5Tw&4P=;wa1TnXl6<;Upu`6WO8f zg1xCOjB`Zcnj&x5l@a4Goz_`_kTa{zu2LSef!N4+o->W0*oAszzG>-7wDM>b-)6F_ zsGQ4G9#mP&sHdzA%qsq6i4JA2etHL}Q!UIDv+K{@jq8EtTk`%xX2?N&zDPJEUCb|M zoEH{|6h2z8oSC0lDAFF;oG)C;=p( ztX0fZlqpsVe{6@wIxtQ3GS@7QR$5D9KJZ$s(&FRR5`XkGE0>P6PPkRn3758aD}sgp zrj_I1bj3mo(6mwuxBKEpGtQy&az9;2`6^uQTPws@b#s-_zA8&)F}3ZlLeug%Sq$=X z@pw7G2(NigtW88Ol+8}xTTR;q&)(GYKC$QNYd345yp~c>g0WQSm6bubQUy3VTOSD? z>#g+}1C6U4_{BIBdw<;!nD)7F|BV#cH8fYf2mxzn%VJDDL7-o^Q5Mr%oecvAJriaK;BhwgiHElUf#w zxU;WYe$TDkNre3OGGu)r{%qeW?+fkW{%z}tAKuBEI!0R_3mgApSR!EJ{kiJ9kk!_aJB8tL-;9Z`9R)9Z*>`5X_v>C zdKM3vO7E#Tj+Z4VnQ>D(40Of~t7K!~T$g-X?fvNKju4MNw(XaPv2DLRjBWenVbIaA zZ@<~X&jo&4yFfOedE9(pm)Sv!m+%K2xnp^@%_*S#M2M&lEY_1?C3 z;On90+kJW`?35;8d=LTW`gh>@4L|uag;)Sb(p`!C=U4O_XYHLjY%zF8gGXWC6ys6n zwRx7HPp;t)uGc4@#N}yS76b>~0c2};CB45NlFHsLDzld1@XmCHL_+%N8 z9g_pZqOgi*h%Z4G-@HcZ8{=dSsd+F7Mu;&zMoT8Yk>~-7-eNCf2O1B8U@Nvs22EZh zgK0HLPmPMx>dn98>uFtn6*z8)ocs35)}DsYA#TI5kEA*Ai)L< zIDZataOAqE!_+_`dy{$u7WaSx;?3j@W{CI(1)`BATrXz{I7xz%(?&J*$%`~meJP~{ zR|&SYLkrpEdXrhSk$t8&d6IS!l27y|8|XL@@QL2!c{(X5dh~Q72jBfl4fg@i z4~6>blhyQ)-K;lxnjW&B^d<}F$H4Rg{iHW}hJFT|56TTX2A8meBqT|`GW5bC2TpF2 z1FV!b*BO0)CAqT67wotuA28cCSvE@oi3YsA}p9D^F=(`tQH*y*0p&-%ocqB$mNrP delta 755 zcmex!iRsD=rVSSuH+wO0@K4rI5}F(%6gF8VhGX&pX^F`Jd>oS>2pLSS2o##Epei-_ z!3>tkcZ3}#pNQp~93ajz$y{pkIexayuSA|OO=g)PHn~9}Zt|@#uE`g~woKNOih{Fm zNG}1hMJ7*>)0zAsV$tRgvO5^j1f&=zCn$M|?G%iPPwcusc}{T=qv2-3 z5@kkaV+M#&RjLuQDTC$Yi}4R9Pe`+4G@LA0a)0xh^aMsmBaoiWZ!%T5fU3)pQ+lQ2LN-VBc1>N diff --git a/PROMS/Formats/fmtall/TUECall.xml b/PROMS/Formats/fmtall/TUECall.xml index 37f5c0b06b7bc38510a690d858d4e629a1cd7371..65adcb98f917fd586dfed49302c236e33f08d99e 100644 GIT binary patch delta 1073 zcmZWoT}V@57(U02W6c?3jcGY`EgdH2bjz`gX`88ywQNn)ES2Tdmf$*!Vd=$?E=Gun z_ypdF+0TW9$l|-`CM3iwDH&aO5#)6jHoS-~!i&Ch+{QV@$KiW_p7(kGzO$R==Du<1 z{fbgIbAh=`&uQV{dqqDok7u!Es4G6P{4@xbsS+bo%BXUvFO{{}R_MT0bs=kLK)fo3 zy~;ZHS~Sb`I`#}q)h?`iHDt6}%Yi?opo;!d4>QK_%zY+KzXbD$-bN-s?}(^Bq*9D& zWlW3>FTItBl_;>~<)Kn*1o^Cm`7a)?yk%u>M(`vkv*3?VDM0zA@xJ#Q7M&bfxHw)y z)2s2+avtFtB@C86EDi`IY4Fh-rwPeZn;s#D&TT_2A>S%BayY~--MlX-f|nl&T{g#b%PZh zpRT@uxz$DGAck#?NO}ef?6l-1?>g>=)EJD;plXspo>#jokg!dh?`1Rz3Ddp$s9yPR-8G)G? zZ^T#xlOC)D)acF_3v)S$Hjr#!uSn)JxG3!|JL4H)+Gr6wob>X_m+QU^eMP$xpQe&-!CYQBj4mI3tv*mJ`tkFY= zPs=YFM1)TvA!3{`i5`ZG5k16+2=PINNKesI^dKVLUH?Axa=zdB{eIs$-|stTc7yq{ z%q;&n3%g`Op69^u7a`ZN$TUwQU(2G%vuJBHqFWGQ;%z5t7Bn}qSmVuL1v{jB40dV_ z_$?SPAWXsH)nQ9`fW=#SRg>PJo%=x*zK zQf52w)5f9{n#b4nw+HCL_l|F9aB)~6EDBDx%z)IwP|mSi@xKB%M-_ePS|m!*fY;6$ zYVTy=x>Z>Pa<z|dhAUfn*9R|i6hC+l=9xI<_ulqWB&M0uVk`nfI<>qEzl ze}>184&d)h(BfS^q3q}{qUz5@%~*}ZkK*mIxYF@acTzW;y&~;P%d>GnX_mO+pjbjB19J)uQn#IEi=UG-<-%v##v; MIU;_LFOVhj54!OcN&o-= diff --git a/PROMS/Formats/genmacall/cpdev.svg b/PROMS/Formats/genmacall/cpdev.svg index f7746192c67f1872a32821d63250f2e9690a56c1..a820f2bf791869f03c973784581e0a76eb41eb25 100644 GIT binary patch delta 32 hcmZ3Zu|{J Date: Wed, 24 Jan 2024 16:44:55 -0500 Subject: [PATCH 02/13] Format update fix. Needed to remove an invalid character at the beginning of the ComPeakFlexall.xml file. Note that the character was not visible in the editor but you could right arrow past it. --- PROMS/Formats/fmtall/ComPeakFlexall.xml | Bin 64112 -> 64110 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/ComPeakFlexall.xml b/PROMS/Formats/fmtall/ComPeakFlexall.xml index eb43e43771a4d354e70d3a303159e7c234809563..805e795a2ae746c1d8049d4637a05260601daac7 100644 GIT binary patch delta 10 RcmezHh56kV=8a5wzW^ft1?T_( delta 12 UcmaF&h55r5W~TrDHst*R05aGI Date: Thu, 25 Jan 2024 11:15:10 -0500 Subject: [PATCH 03/13] B2024-004 In the RO Editor, fixed the issue for when Child values have a length of zero, the parent value will now be displayed (as gray text) in the Child field. Also, when generating a RO.FST file, it will use the Parent value when the Child value length is zero. --- PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs | 2 +- PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs index 98647f8f..82cbd45f 100644 --- a/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs +++ b/PROMS/ReferencedObjects/LibSource/RODBInterface/VlnXml.cs @@ -746,7 +746,7 @@ namespace RODBInterface string csufx = string.Format("_PCCHILD{0}", pcChildIdx); //applicValues += ","; XmlNode cn = elmnode.SelectSingleNode(parentName + csufx); - if (cn == null) + if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default else { diff --git a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs index 6ade16c3..9e1c5208 100644 --- a/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs +++ b/PROMS/ReferencedObjects/LibSource/ctlXMLEditLib/ctlXMLEdit.cs @@ -473,7 +473,7 @@ namespace ctlXMLEditLib nd = node.SelectSingleNode(str); // if not found with just the string, search the tree. if (nd==null)nd = node.SelectSingleNode("*/"+str); - if (nd == null) + if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value else { From 2439524413a4445ddb2f66db3481ba627e93525a Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Sun, 28 Jan 2024 17:53:19 -0500 Subject: [PATCH 04/13] F2024-005-Comanche-Peaks-Arial --- PROMS/Formats/fmtall/CPDEVall.xml | Bin 33250 -> 32810 bytes PROMS/Formats/fmtall/CPFDEVall.xml | Bin 33772 -> 33428 bytes PROMS/Formats/fmtall/ComPeakFlex11all.xml | Bin 71634 -> 71628 bytes PROMS/Formats/fmtall/TUECSAMG1all.xml | Bin 69396 -> 69390 bytes PROMS/Formats/fmtall/TUECSAMGall.xml | Bin 64800 -> 64794 bytes PROMS/Formats/genmacall/cpdev.svg | Bin 5164 -> 5166 bytes PROMS/Formats/genmacall/cpfdev.svg | Bin 5214 -> 5216 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/CPDEVall.xml b/PROMS/Formats/fmtall/CPDEVall.xml index 8f746a23e55d0cf841da252d6d3db95b2ae9ee91..91dfea1cb509dfeef5ab7788f4084bebfdd5b299 100644 GIT binary patch delta 590 zcmaFV%(SY3X~QKx<~)Y{$q)GxCp+*@0kJnffO$&=@q zLo5Ta&sjhX@PdR$m(>=yx^>pepzNP;u~W8?hydw5V+XMi#J*v_3a;jp!!|G*6q{mB z&me55`5G<|{SSfs5At%8-vlU4KBmAo`2jGBE*LM^{LQru=J3yxYdqFKHGiJ0;RR-I Ue(2SSP>|&dQ=qxo$8VZ30CG_1y#N3J delta 644 zcmZ40!1Sn@X~QMH$@@~pCjU~3nry*83Cxz#joNG=kj4a+h?x9K2qNL-Y%0FqSGc%5LpCPgCxFrfv5*FT(C}nYw|vE9iXO)$z6N`ll%B>pmJ)HbDRYx&+r4< zE?zbHjno9FxXt7Z0kb9xC^<}?Co>By26EXv*%@&59JysswLzN~$oqjU+x$yOixIA( zOJxq6-J^;yrAKWVR42?9r^#*_5HXM~PMYh$@<9Jj4%32|0b)mJAApP3=|Eg6rTYpl zmZdij&d$?^*ay;=X8=*lW%vyyzd6n58N{Jp&M-$fOwKdi1XiGB9W}Yl3}P9Gy~Z3f zSmG?Vz|~e*L4rcd`U707!3GjnApI4#5Kn;ERd%c3YP#&Vf!V*5A|@|!cm`%8yJw9P z*o@6y&TAlv020APlizr{On&3G2C4y+7$9PO9_V7XFx2evhN)4Qoa1?9bA<0DBLMFq B4dws< diff --git a/PROMS/Formats/fmtall/CPFDEVall.xml b/PROMS/Formats/fmtall/CPFDEVall.xml index 37e5c29edd901ccf38868475ec2206f0ef829ee5..708b507ab81cd0c3c9c4045f0a21dbff0011f54e 100644 GIT binary patch delta 441 zcmaFU&NQW!X+s;!WUCl~$+K9VF&i>iPA+5-1@SkpVhxdJ&SS`*9H^E#xkU8>h`l*b zjg=8Dct(8|lx;hCgT@)Kf{o_rdh~5mgoy{Dq5y&|Rb8GtKXO@S+Dg)Kh zC(Bq*f~po|oP5S+6I|kx?Fu-X&mQK7^vO~VQ{duCju2;o3^H+A0~Zf*-T`MfxI6=~ zA4Tc$@wJ delta 440 zcmbQz%Jin4X+s;!4Alf4Y$ zCMT(0g0ttT&4aU-sn3D3O(r*KoB^>nM`_MugeyqW-T-AMOs>;`DNdN&rh5P`zDaKa zoV`vT#{LHv+hRBi%#Jep02kY4j4*4T30TkODAOfii#Kzb?|``Amu13aJxhp9zbwJJ zfs!1IlmA(70viQVAY;1>&epS=24@@CPlB`c93a+#)SEf3f{Xh&Z3DAGVU*+i48#Wd zpN(;HiYr8Ol%~#RJ+}fTu*@otHi)}cdEA;T=Dh~26~tcQ1GaXvmoGxW=578-5|aZI L`8I20B<_(7=ChJHGOtugfnfyxP(qs{74G??tFG;n>0Q(~itpET3 delta 42 qcmbRBi+RB><_(7=CjTlEnQS2}GWnUrrO9g~#E|$sn;WENJpur(IunNg diff --git a/PROMS/Formats/genmacall/cpdev.svg b/PROMS/Formats/genmacall/cpdev.svg index a820f2bf791869f03c973784581e0a76eb41eb25..c55e7800e1d14abcfb770a8d90cac50413a44e58 100644 GIT binary patch delta 82 zcmZ3Zu}))ygn+OKgC2tsgA#)RLnVVPkTztnm|QOyIJri^iPez7fWc()K>=Y#h?tt7 Ti>M`oB~XV2s*cU|f@_%o#lR4- delta 94 zcmZ3du|{Kqgn+OygC2tsgA#)RLnVVPkTzs6pWG-IIJri^N!*gb5-4lVV2VXvL(oOk Rg245extT diff --git a/PROMS/Formats/genmacall/cpfdev.svg b/PROMS/Formats/genmacall/cpfdev.svg index 957e503befe4848f46c982716346547a31a7dca6..491735935b8fd707b8c6d7018f80abce28c7b7ad 100644 GIT binary patch delta 90 zcmcbo@jzpPn}E0pgC2tsgA#)RLnVVPkTztn0E(DR-YDohd6j?@t098{gURIg0^*Di Xu@FHQNlOMxpc)HIU7I%wu4MuMi}e#M delta 87 zcmaE$aZh7|n}E16gC2tsgA#)RLnVVPkTztn0E!q+juq% Date: Mon, 29 Jan 2024 15:25:55 -0500 Subject: [PATCH 05/13] F2024-005-Comanche-Peaks-Arial --- PROMS/Formats/fmtall/CPDEVall.xml | Bin 32810 -> 32810 bytes PROMS/Formats/fmtall/CPFDEVall.xml | Bin 33428 -> 33428 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/CPDEVall.xml b/PROMS/Formats/fmtall/CPDEVall.xml index 91dfea1cb509dfeef5ab7788f4084bebfdd5b299..de28c2d304956bb2e13ba5c4958913445e89c207 100644 GIT binary patch delta 665 zcmZ40z_hA?X~QMHN#Z<{|7b=`HshZHVMc8>5J+PJv3(q(CjSwd01+0OoZu`s*+5)v zvW^JH6d13bWl|a-QiXkhG4O6eGwY9kZy(Ys{gVQB}rS zZh@(&uv!LVwpfE*57O6QGYKYIVGH&(NVLjs6->0tejAXv*~h^SY!|vy);NLn1BEvy xI8Q@zEhq&PO@8C)GWm_$8jxWSoe1GR4=lpBu&LbRjii!ma*pSb%@Mwri~uQa2k2q%i@Rjt;4l{|HS03o1@daF&~FAg(r9 zM}%YY0?}!cCx|SHU3>zQ`}l3(vI3KHoCPM&@Z$rj zsG9sn3Sp7jkQ@*G(hYnI#!xEVH^7s&fTEKHspqsgonL4?tOUIuN&|PA<`fv9k0a zR-{hO(}%bW$TEP*rWgXP-OOm@4GPDPnxN2w+37Gj&vX+|QqfEmWRs#<>f|-%5Phi1 z;w-m73|{;ppHA@eHcLYn(t@fv(z| x;5-fCKv47+O@8C)GWm_$8i)dDq(emeJTOIXVNtio8=;PCa*pSb%@Mwri~s?p@=5>z diff --git a/PROMS/Formats/fmtall/CPFDEVall.xml b/PROMS/Formats/fmtall/CPFDEVall.xml index 708b507ab81cd0c3c9c4045f0a21dbff0011f54e..44247a2857dfb0a8d84a6b25bbdaec59937f39d4 100644 GIT binary patch delta 387 zcmbQz$~2{wX~PedNo+im_t?ZuPEx%DW6o2X2V*W%p95in*?L7(T6iv7%YH^ZZd@05jS~<5nRC*W4K{^Ou(XGn@trQu!sIBc2_Pm=#biD6CzJnKZvt{R@3CP+D7KphQ*2-lwGe28 z1JoG_lg%7gf%Lp_6oY#+$N3q|)H=;alT%z_PMX}OD7V?gEs6;ueQR=y=Ngb^8?QE~ YOK(kH;RCkN#_QH(6+f`-9lssM00irm#sB~S delta 353 zcmbQz$~2{wX~Pc{#=OZJZ89e(sa}Gz=BdqtvX-gO0kiBUH))&!vJAcSH`i%aF+!!2 zv^PLmH99aYExL!GVjJ`(L0N0`VXPGf3!q|~3?W8mPTpYzligwrGi8qnNDOS9X#>bQ z5L3^53dH8@$$FLtz~*F6jrIS#n>X4B!WG(0gDNzzhgbvD>;SPk zd$O71DxmU*j*2iJ From 9beeee2aac78432fe1e6666459408c09e0c7fd88 Mon Sep 17 00:00:00 2001 From: Paul Larsen Date: Wed, 31 Jan 2024 09:18:22 -0500 Subject: [PATCH 06/13] U2024-003-Help-Menu-Additions --- .../frmVEPROMS.Designer.cs | 34 ++++++++++++++++--- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 21 ++++++++++++ PROMS/VEPROMS User Interface/frmVEPROMS.resx | 12 +++++++ 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index d5e9c4ea..59628177 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -36,6 +36,8 @@ namespace VEPROMS this.btnShortCuts = new DevComponents.DotNetBar.ButtonItem(); this.btnHelpVWeb = new DevComponents.DotNetBar.ButtonItem(); this.btnSendErrorLog = new DevComponents.DotNetBar.ButtonItem(); + this.btnShowErrFld = new DevComponents.DotNetBar.ButtonItem(); + this.btnShowPrtFld = new DevComponents.DotNetBar.ButtonItem(); this.btnHelpAbout = new DevComponents.DotNetBar.ButtonItem(); this.office2007StartButton1 = new DevComponents.DotNetBar.Office2007StartButton(); this.itemContainer1 = new DevComponents.DotNetBar.ItemContainer(); @@ -206,11 +208,13 @@ namespace VEPROMS this.btnHelp.KeyTips = "?"; this.btnHelp.Name = "btnHelp"; this.btnHelp.SubItems.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btnHelpManual, - this.btnShortCuts, - this.btnHelpVWeb, - this.btnSendErrorLog, - this.btnHelpAbout}); + this.btnHelpManual, + this.btnShortCuts, + this.btnHelpVWeb, + this.btnSendErrorLog, + this.btnShowErrFld, + this.btnShowPrtFld, + this.btnHelpAbout}); ; this.btnHelp.Text = "Help"; // // btnHelpManual @@ -244,6 +248,24 @@ namespace VEPROMS this.btnSendErrorLog.Text = "Send Error Log"; this.btnSendErrorLog.Click += new System.EventHandler(this.btnSendErrorLog_Click); // + // btnShowErrFld + // + //this.btnShowErrFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS; + this.btnShowErrFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowErrFld.Image"))); + this.btnShowErrFld.Name = "btnShowErrFld"; + this.btnShowErrFld.Text = "Open Log Folder"; + this.btnShowErrFld.Click += new System.EventHandler(this.btnShowErrFld_Click); + // + // btnShowPrtFld + // + //this.btnShowPrtFld.Image = global::VEPROMS.Properties.Resources.GoToParentFolderHS; + this.btnShowPrtFld.Image = ((System.Drawing.Image)(resources.GetObject("btnShowPrtFld.Image"))); + this.btnShowPrtFld.Name = "btnShowPrtFld"; + this.btnShowPrtFld.Text = "Open Default Print Folder"; + this.btnShowPrtFld.Click += new System.EventHandler(this.btnShowPrtFld_Click); + // + // + // // btnHelpAbout // this.btnHelpAbout.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -1733,6 +1755,8 @@ namespace VEPROMS private DevComponents.DotNetBar.TabItem infotabFoldoutMaint; private Volian.Controls.Library.DisplayFoldoutMaint displayFoldoutMaint; private DevComponents.DotNetBar.ButtonItem btnSendErrorLog; + private DevComponents.DotNetBar.ButtonItem btnShowErrFld; + private DevComponents.DotNetBar.ButtonItem btnShowPrtFld; private DevComponents.DotNetBar.TabControlPanel tabControlPanel3; private DevComponents.DotNetBar.TabItem toosTabReports; private Volian.Controls.Library.DisplayReports displayReports; diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 0ff406ef..8ef3ef42 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -21,6 +21,7 @@ using DescriptiveEnum; using Volian.Base.Library; using Volian.Print.Library; using JR.Utils.GUI.Forms; +using System.Diagnostics; [assembly: log4net.Config.XmlConfigurator(Watch = true)] @@ -4932,6 +4933,26 @@ namespace VEPROMS } } + private void btnShowErrFld_Click(object sender, EventArgs e) + { + string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); + path = path + @"\Documents\VEPROMS"; + if (Directory.Exists(path)) + { + Process.Start("explorer.exe", path); + } + } + + private void btnShowPrtFld_Click(object sender, EventArgs e) + { + string path = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); + path = path + @"\AppData\Local\Temp\VEPROMS"; + if (Directory.Exists(path)) + { + Process.Start("explorer.exe", path); + } + } + private void btnHelpManual_Click(object sender, EventArgs e) { // C2019-024 Display the PROMS User Manual when user click on the option in the Help drop down menu diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.resx b/PROMS/VEPROMS User Interface/frmVEPROMS.resx index d5038add..c950d8f5 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.resx +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.resx @@ -170,6 +170,18 @@ rkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII= + + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAANUlEQVR4nGNgoBR8ahL8jw1/bBTooMiAT8Qa8gmPAUQZ8n+Z3n9KMMOoAf9Hw0CPCmEw4AAA71z+QhwwNhoAAAAASUVORK5CYII= + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 From dd1a8dea3331ab2091d7184062bcb0df53da255e Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 5 Feb 2024 08:59:23 -0500 Subject: [PATCH 07/13] F2024-010 - Added a Landscaped Word section type to all of the Vogtle Units 3 & 4 formats --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 176660 -> 182208 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 212606 -> 219214 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 207950 -> 208380 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 88292 -> 94898 bytes PROMS/Formats/genmacall/VEGP1.svg | Bin 9628 -> 10888 bytes PROMS/Formats/genmacall/VEGP2.svg | Bin 10586 -> 11846 bytes PROMS/Formats/genmacall/VEGPAlr.svg | Bin 8378 -> 9056 bytes PROMS/Formats/genmacall/VEGPBck.svg | Bin 9628 -> 10888 bytes .../Properties/AssemblyInfo.cs | 12 ++++++++++-- 9 files changed, 10 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 79e4128c958ec7d5d64e06207452396e2e1181d2..ede0fb895ab01af4dc14a5a53d623633937cc6e3 100644 GIT binary patch delta 761 zcmaKqOK4MJ6ok(|Nm@}CZLjU354}nap@ed8nn$xxBNagieON6jQW76jON_y$whDp) zEnWCPYcm^3gQyDyH4wPC(~TgAD7bN_;L?S58&LmbXA-(Qd<--HIsZKPvH8v2E!S_T zGP27Yt*8MbE=ftt8JUyQddkRIF?lxAuXIKJt5?dntK7-GUb;HNRAbO2PQG~g5Wpmn(lPr#4 zHt$C_t$B2~f?`)Q7MQq%6IBmyejXOBB;1Bo7xllkXz9GRoAB0*RDA^ZUO>=@O0>?T zPM6}(tJub+Mf7&sqL}&AQ1#x*7guo57-~33vw+L_oZdXsij-?o4$&S% z&J~t0+mGTkO~9<-d*e;{nM9^9t7Q_J zJi(J~yVVk=KaA7gZDU$8oo_W$%k+PnnL4H&X5yG`#Kt7F{mx>h2th{U>HYheytg-O mWvXC>aFnMnSi)4becEoOEOwwp50^8EP6t}VF@4T)CKUiqpEADy diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 7aec1f8dd58d63ae80866701032da9692be032be..227aa23305d24202ae9a5ded311b80867bb237c6 100644 GIT binary patch delta 591 zcmaKpO-NL66vfZIw~5FeIF2()@n)v5>|^!Dah?;D3qL>*({!Vy!;ltHlwn{SOCfMA zFMxEx`?142!vrEtiP|-%uu`gJLms#Ip^rtneC!8|C%=VL|K;) z=~B2Kc|5@+W^m6=)0onOJ$AKzmM@Eklv#hrJ9IIFIb1*zxA7FSxMAlubOcJ5RUQXQ zN`Ka|Ymy~urf3GKD%*o^h9)^mky_6;`7abEo&LZLl7?sUi`+_@+~mdp=_M!ry5y@p zT6%j#=|~pYsy}@Fw8G`c2yS5z!{|X5M$l(zK$pIf8}(qfsJ>&utL%^#zjJS-t!C|i zKWQGV@imfR^y%+WUZ9LFjPd7yb9XBF(^`;yK~Py_jWqx?9%>qWuKl!gF<1g5jtT6dSD#76&izH zaC2$CNS6a)y1_gjOhFE~p#?@^0;&|QfPl%=DrVSZ%K5@YnezOAY=}O_8Pd=%Bdg>> z%?IVb)PC;VpnG0)XpQ5RK~ZT7~=OQs@E!FThrzAGg*n<@ifbKS>%w_^VEbtaC;#N z4;G_Hb}UgYVFPa(RLosrDp_B|IC*W5t?l1lm52 zrmva6#KWq&EmsKiA}f<($t4RfLa-lD zlyfn3RsMj5U6oW4BkH0c!7f8lg1m{1KJ+5I>fMvjNkax+=9zcqnVEYON6XvMi(9ycL0nZ{27R2RYMD(@fWJ3-Ce{n@=};8I@WY3T7{CxtC_jvPCz4Q+ zv=a%*k1{ew7k_f*qlf46ev0y^yiPG5%hj=O{EHq%XiH6upH7+F^rnZC`J1DY`((eL zyd@UQBG-^S^HT#~e%maCgA}Yb5mZ(j<8RY{Q*+;1x#4-O!=n1SxTWkkS$Z7tE%olC zw4Oo-lITQ>>X1U4Lg#tqwLzx5Dy8Bkn~ah;kPG z*mhP*nqKsy5AC>tLHW=^I&VDj%CbQt+*In3g)`*SOjwA>d@D6-mXfJn%5AFAVu+}y YX_G;gblB7{OJ^w{6-la)=}UC%H>ds4AOHXW delta 33 pcmdn=l=aC*)`l&NznmC3Cl|gE-<}k~I6-u}P%NX^^tK{K9RT&~45SLkdGNLo$$6z>vzI03;I`(!s1GhJ1!1plm9TRDh~f zV8{US6Ct9L_lwIiJ299|Hk1~g{D4bf@;xR!W^)F^$qU(KnN5N8LH5$g5BS(7C$I=j z-ovcLY{pW|Eg TVA08J5LJ8G`ZtG(x(NUP*e5bB delta 16 XcmeAOo#Va1OLVdWJI`h(DK`NCGdBev diff --git a/PROMS/Formats/genmacall/VEGP2.svg b/PROMS/Formats/genmacall/VEGP2.svg index 4f504cc377249b70d75ffe14d4f09e5a8a1a5d32..ea6cf7c3b97bbb516e6c357620218a427c7b568f 100644 GIT binary patch delta 216 zcmcZ=bS!2Ao2a)UgDwy%F!(SeGUPF&FcdQ+16c(OsX(y;AS)frN@B=oC<4l+0!am^ zN(F`tAU_c*3N&T%Ln%pSCkC_0g&N9}uQBN{n==?rp2;rDYzn0N#Y!g^ut@;L1tuS1 zmSQ$zu$cUixs%xhs9up(cya@a2$(&cr5!4!4pk#MIf1nVXomUZ>#XWvnvty?On0*( O)SP0g+AJjMAp!uNI5QIf delta 16 XcmX>Wb1P^Ao9JW*4xY{bBt1j`J5L5D diff --git a/PROMS/Formats/genmacall/VEGPAlr.svg b/PROMS/Formats/genmacall/VEGPAlr.svg index 921e5718140c98aedae08b8788583e6e87275217..d887ab27d59f50b8e2137984f025b5703967f423 100644 GIT binary patch delta 190 zcmdnx_`q$$Ez!vzxH#;67!n!s7*ZID8Ipml0)|uu1t6KokPc=gG2}B80cBHxqyki> z0z(Fnp9m41Y|AarY{sB8`60XV4gkep BE0q8M delta 208 zcmaFhw##wDEz!vr*!U(ph_QJqFxW6CGUx)K0z(o*K0^hA8IYC9Pz)sVfcz35oy<_m zPy~djK#>xL9EM7uSSe6NDnklbryT#%0?o>2NCT3^3>iSt6rkOC4Cx>fCoA#_PY&ah0-DFi cY|dahc{TTJW}r(a?-i8=x}RtBC8<6R0K_URYXATM diff --git a/PROMS/Formats/genmacall/VEGPBck.svg b/PROMS/Formats/genmacall/VEGPBck.svg index 15ffe7db3162883d47f1b66e07ffad8665b371d4..91f088b6972d48fbd71eb8ca12b0a0961852e37b 100644 GIT binary patch delta 194 zcmbQ^-4VLMOLTGq7l*wMLn1>SLkdGNLo$$6z>vzI03;I`(!s1GhJ1!1plm9TRDh~f zV8{US6Ct9L_lwIiJ299|Hk1~g{D4bf@;xR!W^)F^$qU(KnN5MTKJ#{FGX{&vFPS@; zO@Qi3S=7Pwe3o`Ft;wnmmJep_1gbZme4kaF6G$_dFz5kQe`Ib1i%w>PsM^cczd20Q GO#lEEIW5ir delta 16 XcmeAOo#Va1OLVdWJI`h(DK`NCGdBev diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index f715524d..d0745478 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,16 @@ using System.Runtime.InteropServices; // Revision DHH (day - no leading zero, two digit hour - military time // // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** -[assembly: AssemblyVersion("2.1.2311.3014")] -[assembly: AssemblyFileVersion("2.1.2311.3014")] +[assembly: AssemblyVersion("2.1.2402.508")] +[assembly: AssemblyFileVersion("2.1.2402.508")] + + + + + + + + From de8249b584b92a6d133a1cc827d81aae60a658bf Mon Sep 17 00:00:00 2001 From: John Jenko Date: Mon, 5 Feb 2024 09:39:11 -0500 Subject: [PATCH 08/13] F2024-011 - Adjusted the Cover Page title length in all of the Vogtle Units 3 & 4 formats --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 182208 -> 182208 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 219214 -> 219214 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 208380 -> 208380 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 94898 -> 94898 bytes .../Properties/AssemblyInfo.cs | 5 +++-- 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index ede0fb895ab01af4dc14a5a53d623633937cc6e3..8a5958a0d267166638ab095523f0ba83108e306e 100644 GIT binary patch delta 27 jcmX@m&wZeudjki{^nle&EX_PD?K~`u+j&@+wj2fkf)WUH delta 26 hcmX@m&wZeudjkgxvpIuNGdD{+Hw)u-ZWgAkhXHBy2Sxw@ diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 227aa23305d24202ae9a5ded311b80867bb237c6..e62fa61721ea8babb6b3718ddd9e42bc5db6e93f 100644 GIT binary patch delta 30 kcmX@Nf%n`7-VI_b%w`Oh&5|tbk}Qls%(PvSh1oO&0FfLAo&W#< delta 30 kcmX@Nf%n`7-VI_b%;pS6&5|tbk}Qls%(PvSh1oO&0Fbf=m;e9( diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 70827119a2beec03f9ab040678628e8b58e36907..74e29ab11bab5ee78e07b72e1239924cc57a3a80 100644 GIT binary patch delta 30 kcmex!o9EAMo()&Hn9Ue0o3C@VU*}>3Vy5laxtLXz0oHp9;Q#;t delta 30 kcmex!o9EAMo()&Hn9UiCny+)UU*}>3Vy5laxtLXz0oD-<+W-In diff --git a/PROMS/Formats/fmtall/VEGPBckall.xml b/PROMS/Formats/fmtall/VEGPBckall.xml index 4371fd14788d69d83e935920c247403b38e9dbbc..e7e36a2a2e05aa71165d8d9939a1ee3cbab585d4 100644 GIT binary patch delta 22 ecmdn=ly%cn)(vtj%w`Oh&5A7B6 Date: Mon, 5 Feb 2024 15:43:54 -0500 Subject: [PATCH 09/13] F2024-008 - Updated transition definitions to title case section numbers, section titles, and procedure titles. Also surround section titles with parenthesis. --- PROMS/Formats/fmtall/BASEall.xml | Bin 101204 -> 101344 bytes PROMS/Formats/fmtall/VEGP1all.xml | Bin 182208 -> 183426 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 219214 -> 220392 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 208380 -> 209558 bytes PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 56562 -> 55634 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 94898 -> 96116 bytes .../Extension/TransitionExt.cs | 6 ++++++ .../Format/PlantFormat.cs | 19 ++++++++++++++++++ 8 files changed, 25 insertions(+) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index 544050467953d5b7d1c021e96bb46d9012093cb6..2d2705fe4b3de4fd01ccfe1e693fea03e713960e 100644 GIT binary patch delta 85 zcmV-b0IL7gmImOL27t5yazmFcLIDPsNJ9Y_liXYym(W516qm3=0R*>rLjnE)m%xMp r1`~1sWdLpfa{xgAasY1tbpUPvWRw46DU%@E43}s~0Tj2EMFGA=@7o-O delta 30 mcmaDbo$bmrwuUW?Mb4A#*tQ>XX8gxEIVXi@JD(flC078)$qW1d diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 8a5958a0d267166638ab095523f0ba83108e306e..8eb46134d960b85355e7c9a3f3afc7d334655a61 100644 GIT binary patch delta 645 zcmX@m&)qbWyI~7s+SBO@M;JM#XFX-yH#x$BZ@SqtMx*IzXBY(p6B!B^iWx!}iWm|Z z@_?+&$^MqIvd%zW0fQlsU&7$bkOAZsA=FG}R1;RmBhL`bkjjt@)S1bUKmFlTMq&KM zO<%ZxNq+J%3jyIGpgxcr9D%mwGn4|^DU*L2NKU?IDlmQBbw;7-4bK>rKt2(e{@^*I z+GIX&w&~ZNF%c02D0&8d?BkRWrB&9aIGN5?p+`>~ltW z3bapr!KgUB;yGi&WIJ}D>5rZ>s!Vop<(Pis8KcN_r5B7Q(I7WeGX#J=lni8t0Nqf+ zkOOoR#C_Eal(~Jn%L_&!n%V;NqUrRm=Zt=EFK)l^jFE#8#N7_`u@U3cb4&u$o1QT$ TKoXhLOGX(mYkSg5#<+U`9R;FI delta 120 zcmZpg$$g-oyI~7s+SADjjx5vjo-*#6eqs|7-*l^Ij7E%Ulh@mdPk->7QDpk7w~Tz# z8s6QE7Y4Yeo*n>3PSY{K*auY}*gK0g6rjXT&xA(Q`&2unw@HAG#S?rn9_b OlmPLztGr{3y9WUFFEL^O diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index e62fa61721ea8babb6b3718ddd9e42bc5db6e93f..74585b7ff3e6e62fc24a351ba729a4dce7de990d 100644 GIT binary patch delta 584 zcmX@Nf%nBu-i9rVpKec=uw>?&c8Aeu@-aOD)uZroj#hK-&A6v*M##_wb z2(%@ip%iFO%4BzK&FMX78HJ`d-C-1&E_R<$Z2EyUj6BoZ?l3A%K48W%{mdOkj_ENV z;=mn7HA{O2J%(VQo05U9R$%a8NCBEv%b){f2LnY?fj&}TsAh0u$OMXmd*9mee|?l3K@1^`wcj^_XX delta 49 zcmV-10M7sDxed;+4S=)(^4pi_Ap;JU+yOF|;+p{;mn`1_6qm5$0Tz?MI1Gm%;Q_ZG H;R48eKL-`s diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index 74e29ab11bab5ee78e07b72e1239924cc57a3a80..e0144098ba1ea0600474526b94ea651d3cfc56af 100644 GIT binary patch delta 601 zcmex!n`hcno`x-q2VPGum^F!qN~SLxy68 z5(a0644{G{h7cf5WXPMoQG;1n7LNjk;>nEM@&r^U>PXw#GAMx!EoDdrvJ@Bsz}BQP zX91X`BQPzq$HFa!hTlYtJ&1d8MVbz}nBInxJOk}AP%c$pvckc(|^5X hj5&CvL*u{m;CMl5|@7S0T!3Ao&gMp?(hM( I?(hPrL0cggnE(I) diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 6e484f1f96a400473c157100b6b58434d5674291..0df3fb9cfaef6ba3920b528afbbf21855dc865ae 100644 GIT binary patch delta 600 zcma)2Pbfoi9RF&X#ad=>Z<{^5Bo0h592ACxXsyQe)z~CuvwtWNxk~DD-Fs7>v70!# zI}1k_cL&8$4!(P`9Q^Co@9+2X{rvg8T$=9AO=k-#_8c}e>eUc){r*n+9L*%tG$m+_ zVw9p$icp$QVao8jLX#Ay8GesY9LZUSJxWWIWklu^frp&4YKF1vltEH*z^qF4F}}?k z{TZ5I_OMauRy)12p|C<-2FEBZGIQ!f0na&SLrMSJD*H&|R%-eKF(r5r@(GR^TIu8_AEtFL=p6;!dAz*S@67T)u_YY~f_b5=^>#7>MVFzR z3b-mra7Suuf}D7n<~T(P>XE;UE&1vgw4hHDAQpNU-{OjK!YpTuvB$4{zWgq>#zhp0 Ujr>D49B{7dqF6d#JQgkfcj1$z(f|Me delta 986 zcmbu8OG_J36vxky`e=|C5~+kLnNg~SY8xGVEEG{UE=05mxbzuoz(#9gH^FZF0^)z; zLUAS!x4stQ)};#wIluFm;~mHUeaF`18vgYbD(x^$ zFAmpT2>x{zY0|*e15NRDg(NIZqRPC)Bq33mrW~O>C8ONODNj%nl{ohazWw1dEi*Ek z`$9iZbT2Zdd)e?{L@mZjx=ab;BBMK0sl$coQv%pd=?G>&A(nDJ&<xHvTn#BWjz2ZvY$q!cW zP3qv8oG_bXvdT(<$quW8CKq_KO;%cIVQJ5x#}Ler%8(3nsse)tLkiHWS_T~;I~XXE z3Ur79Lp6gN&~rs#@4&?;&tD}^f$qDj6ek~9nJ`%{M+oQ+A+Vc1*n`|8HaTyVNi@g> z)eHe(pCtp?A>bg+0lEm{x@rbWT&|v~z~BcAv0S)mw6W>#D$~i=R{Ej%GA@i`vC2wD mnAm2ARSJxg;}#2mg8>{<9FrdyuuPt`S^}8xbh delta 91 zcmezJj&;*h)(xAMPZo$}nY?THzUecP8Tlr+tuSIto1ADQIeE)!p~-x!_<+(po0qNC rVw}9smJ2ATGPy2_V>91+Hpa<$CR~$MHYk7%@Yx^(qBj?8U^xx|7b+yi diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs index aa178018..483a321a 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs @@ -1545,6 +1545,9 @@ namespace VEPROMS.CSLA.Library { //if (tb._FromItem.MyContent.InList(5322)) Console.WriteLine("Here"); string str1 = TranGetSectionNumber(tb._ToItem); + // F2024-008 added flag to title case the section number in transitions + if (tb._FormatData.TransData.Cap1stCharTransSectionNumber) + str1 = CapFirstLetterOnly(str1, 0); if(!tb._ToItem.ActiveFormat.PlantFormat.FormatData.PrintData.SpecialCaseCalvert) return str1; List FromSections = GetSections(tb._FromItem.ActiveSection); List ToSections = GetSections(tb._ToItem.ActiveSection); @@ -1615,6 +1618,9 @@ namespace VEPROMS.CSLA.Library sectionTitle = (tb._FormatData.TransData.CapsTransitionsSection ? sectionTitle.ToUpper().Replace(@"\U", @"\u") : tb._FormatData.TransData.Cap1stCharTransSection ? CapFirstLetterOnly(sectionTitle, 0) : sectionTitle); + // F2024-008 Added flag to surround the section title with parenthesis in transitions + if (tb._FormatData.TransData.ParensAroundSectionTitle) + sectionTitle = string.Format("({0})", sectionTitle); // B2017-236 Replace embedded returns with spaces and trim the spaces from the end of the section title. return TrimSectionTitle(sectionTitle); } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 250a4367..2b09e8d5 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -7103,6 +7103,7 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTrans, "@Cap1stCharTrans"); } } + // Title Case section title private LazyLoad _Cap1stCharTransSection; public bool Cap1stCharTransSection { @@ -7111,6 +7112,24 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _Cap1stCharTransSection, "@Cap1stCharTransSection"); } } + // Title Case section number + private LazyLoad _Cap1stCharTransSectionNumber; + public bool Cap1stCharTransSectionNumber + { + get + { + return LazyLoad(ref _Cap1stCharTransSectionNumber, "@Cap1stCharTransSectionNumber"); + } + } + // Parens around section title + private LazyLoad _ParensAroundSectionTitle; + public bool ParensAroundSectionTitle + { + get + { + return LazyLoad(ref _ParensAroundSectionTitle, "@ParensAroundSectionTitle"); + } + } private LazyLoad _UseTransitionModifier; public bool UseTransitionModifier { From 41abad1ad99d67fddd70310f5c9b5d919f09b038 Mon Sep 17 00:00:00 2001 From: Kathy Ruffing Date: Tue, 6 Feb 2024 11:47:49 -0500 Subject: [PATCH 10/13] B2024-002: save step before update ROs from Step Ribbon --- PROMS/Volian.Controls.Library/StepTabRibbon.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs index 2cfc387d..5bbbeeee 100644 --- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs +++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs @@ -3395,6 +3395,8 @@ namespace Volian.Controls.Library Cursor = Cursors.Default; return; } + // B2024-002: Save any changes to the database so that updating of ROs has current data: + MyEditItem.SaveContents(); using (DocVersion dv = DocVersion.Get(Mydvi.VersionID)) { swROUpdate = new System.IO.StreamWriter(ROFstInfo.ROUpdateResultsPath(Mydvi)); From fa10fe4190816f1f5a62ac5ea11dec6654de4794 Mon Sep 17 00:00:00 2001 From: John Jenko Date: Tue, 6 Feb 2024 16:30:35 -0500 Subject: [PATCH 11/13] F2024-012 - Adjusted the Cover Page title spacing in all of the Vogtle Units 3 & 4 formats --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 183426 -> 184034 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 220392 -> 221000 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 209558 -> 210166 bytes PROMS/Formats/fmtall/VEGPBckStpsall.xml | Bin 55634 -> 55246 bytes PROMS/Formats/fmtall/VEGPBckall.xml | Bin 96116 -> 96724 bytes .../Properties/AssemblyInfo.cs | 5 +++-- .../Volian.Print.Library/VlnSvgPageHelper.cs | 2 ++ 7 files changed, 5 insertions(+), 2 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 8eb46134d960b85355e7c9a3f3afc7d334655a61..97afe8f2981bc575d302cd19b6a1eee98bef8b6d 100644 GIT binary patch delta 120 zcmZpg$^B?9cS8%~7A78c&JYGqh7blH2G{A1*-YZwos5~p7?A~;n1q>)7!0->vNNgc aB1;fbEh{|T&YOv6a*YJX_I2(|S6To%a2j3! delta 64 zcmaDfm%C{ucS8%~7A79{>6a>)gr@5>F$pnRZcpT3QrATnkrkdk&zFg3a*YJXc0Mnr GD=h$)suO K-si-;O9lYOu^Ep5 diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index e0144098ba1ea0600474526b94ea651d3cfc56af..b2957f4d9aab726e3d9d31c0d5576508ee321d6f 100644 GIT binary patch delta 152 zcmbRCl;_(^o`x32ElhdRoFNRJ3?U3Y46f4)Uowd^nr?sS!NkcpeVqpr4>w$n!Du?8 t7nAUGAtok~=?ZB~72D-xnC9qEpm~ze^ab%uJlpr^G0kA!4rG421OPIzDJuW~ delta 55 xcmezNl4sgeo`x32ElhdR(-+NR5}Mx9&LqTWx!vBINmh9K1AQhgDRlAeF9Ap-6Q=+G diff --git a/PROMS/Formats/fmtall/VEGPBckStpsall.xml b/PROMS/Formats/fmtall/VEGPBckStpsall.xml index 0df3fb9cfaef6ba3920b528afbbf21855dc865ae..afdfb3c228c120b5130d84a6627d47f3c9313b00 100644 GIT binary patch delta 75 zcmcb#iTT`m<_&CfCJP90P0m@&wYhGt3De{^^F=0~nlHEc&HOe-AV+QUoQ0<#j0uY+ b7&ot3;=njrVHw}#e@o?nw900WWn9JpF)AW< delta 243 zcmX@Np83)y<_&CfCJU&tOy-;8rme}K$)Lxe#Gt_7!H~#M#E`-e%uv7(0%RpJ3oJ{20w;UhTO>$Lxm?V5fqsGg-L`p6sRg?a-)@~umXb%P)#sHDo|YsLne@&H(7D6 z^yCa#p2@f7$V^@`S8TGvT#dz{a$&H_d8I7iY^kWpB bzCo0+YV(HEb94~WBx#%^w7rj;@mV$i9o#IF delta 49 ucmccenf1#%)&-}hFY;v+nq2Z(h|zNM#b2_*ldA+pHn-jXCW$J+Tn_+Nb{6CS diff --git a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs index 1dcc5de0..699a2c37 100644 --- a/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs +++ b/PROMS/VEPROMS User Interface/Properties/AssemblyInfo.cs @@ -44,8 +44,9 @@ using System.Runtime.InteropServices; // Revision DHH (day - no leading zero, two digit hour - military time // // ********* REMEMBER TO CHECK THE AssemblyConfiguration SETTING (ABOVE) ******** -[assembly: AssemblyVersion("2.1.2402.509")] -[assembly: AssemblyFileVersion("2.1.2402.509")] +[assembly: AssemblyVersion("2.1.2402.616")] +[assembly: AssemblyFileVersion("2.1.2402.616")] + diff --git a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs index c5c2e949..92554a34 100644 --- a/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs +++ b/PROMS/Volian.Print.Library/VlnSvgPageHelper.cs @@ -1836,6 +1836,8 @@ i = 0; float coverlinelen = ((ctlen == 0) ? (int)section.ActiveFormat.PlantFormat.FormatData.ProcData.TitleLength : ctlen) * (float)pageItem.Font.CPI / 12; string title1 = section.MyProcedure.MyContent.Text; if (section.ActiveFormat.PlantFormat.FormatData.ProcData.CapitalizeTitle) title1 = title1.ToUpper(); + // F2024-012 copied this line from above (processing COVERPROCTITLE) to resolve unit designators in the procedure title + if (title1.ToUpper().Contains(@" Date: Thu, 8 Feb 2024 06:50:10 -0500 Subject: [PATCH 12/13] B2024-005: Vogtle Alarm pagination --- PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 210166 -> 210166 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index b2957f4d9aab726e3d9d31c0d5576508ee321d6f..e9b5ae4badc564cd6af12ca350e3cc8a644a94d6 100644 GIT binary patch delta 28 kcmezNlIPn?o`x327N#xCR}2}=rYkZtJ8l; Date: Thu, 8 Feb 2024 15:27:53 -0500 Subject: [PATCH 13/13] F2024-013 - The end message for Attachment and Procedure Step sections is now bolded and have a dash before and after the end message --- PROMS/Formats/fmtall/VEGP1all.xml | Bin 184034 -> 184686 bytes PROMS/Formats/fmtall/VEGP2all.xml | Bin 221000 -> 222116 bytes PROMS/Formats/fmtall/VEGPAlrall.xml | Bin 210166 -> 210286 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/PROMS/Formats/fmtall/VEGP1all.xml b/PROMS/Formats/fmtall/VEGP1all.xml index 97afe8f2981bc575d302cd19b6a1eee98bef8b6d..6640b2c839ecdc6e7cd4a73f91380f07173a5eff 100644 GIT binary patch delta 262 zcmaDfm;2o!?uHh|Eleh>m~|NxrW>zf(q>j*(4BtpCZqK91S6)1=?-%kIi{cc&nPf` z+EJ#KsRB$~+g3BJ69p@eKgy(xPkG$rYfJ*uC+ubl*uLl>(>`W`nzjS&5McpX$2a}M zN+uU&praUE8T=SrfV4k@8<2DZ(mp`GKSL-(2#}A}t*ovLc?>C&8CgZAU%0}^GJV}T eCco)E2bttR?w_`rNpAXqex|VP3r;aPu>b(8NmP~q delta 139 zcmaF2i2Ko8?uHh|Eleh>rdzCH(&ATQP++iQ;AP-q-~_?#uU9cSicL2-$fSfJb^9Pw zBMWvZ?&D07EYk&!F>y?9=w)P?zH2vA&Qt*=uIY8FndGJ)=w}L>zF-a`+jO-pOk&$T J&N8X7003q&BkBME diff --git a/PROMS/Formats/fmtall/VEGP2all.xml b/PROMS/Formats/fmtall/VEGP2all.xml index 00006cb3881629edfa041edc3610c95c3221e946..f0beeefd8761ff1c3d4bc3436dd9ae601e079fdd 100644 GIT binary patch delta 226 zcmX@Hk9Wy&-i8*&7N#xCKGM_GoS22CM@ciwFe@xOmhBP?3 diff --git a/PROMS/Formats/fmtall/VEGPAlrall.xml b/PROMS/Formats/fmtall/VEGPAlrall.xml index e9b5ae4badc564cd6af12ca350e3cc8a644a94d6..0752764ba24c1c5ebec1b4a56dc3ac156dfe571a 100644 GIT binary patch delta 139 zcmezNlIPtko`x32ElgYorw5oY