From 96b1edb78fee44d87269fff68ade9e5a58906263 Mon Sep 17 00:00:00 2001 From: Rich Date: Tue, 5 Feb 2013 14:56:26 +0000 Subject: [PATCH] Enable Westinghouse formats to be updated without Build. Changed Header design for alarm procedures. Changed Header design for alarm procedures. Changed PSI for alarm Procedures. High level steps are not bold Added non-printing section for Limit Information --- PROMS/fmtxml/Form1.cs | 85 +++++++++++++++++-------------------- PROMS/fmtxml/WSTALRall.xml | Bin 46592 -> 51010 bytes PROMS/fmtxml/wstalr.svg | Bin 3424 -> 3672 bytes 3 files changed, 39 insertions(+), 46 deletions(-) diff --git a/PROMS/fmtxml/Form1.cs b/PROMS/fmtxml/Form1.cs index 5c7ea879..adeb49cd 100644 --- a/PROMS/fmtxml/Form1.cs +++ b/PROMS/fmtxml/Form1.cs @@ -582,55 +582,48 @@ namespace fmtxml private void btnWestinghouse_Click(object sender, EventArgs e) { DateTime tStart = DateTime.Now; - if (File.Exists("wst1all.xml")) - { - FileInfo fi1 = new FileInfo("wst1all.xml"); - fi1.CopyTo(tbResultPath.Text + @"fmtall\wst1all.xml", true); - } - if (File.Exists("wst2all.xml")) - { - FileInfo fi2 = new FileInfo("wst2all.xml"); - fi2.CopyTo(tbResultPath.Text + @"fmtall\wst2all.xml", true); - - } - if (File.Exists("wstcklall.xml")) - { - FileInfo fi2 = new FileInfo("wstcklall.xml"); - fi2.CopyTo(tbResultPath.Text + @"fmtall\wstcklall.xml", true); - - } - if (File.Exists("wstalrall.xml")) - { - FileInfo fi2 = new FileInfo("wstalrall.xml"); - fi2.CopyTo(tbResultPath.Text + @"fmtall\wstalrall.xml", true); - - } - if (File.Exists("wst1.svg")) - { - FileInfo fi1 = new FileInfo("wst1.svg"); - fi1.CopyTo(tbResultPath.Text + @"genmacall\wst1.svg", true); - } - if (File.Exists("wst2.svg")) - { - FileInfo fi2 = new FileInfo("wst2.svg"); - fi2.CopyTo(tbResultPath.Text + @"genmacall\wst2.svg", true); - - } - if (File.Exists("wstckl.svg")) - { - FileInfo fi2 = new FileInfo("wstckl.svg"); - fi2.CopyTo(tbResultPath.Text + @"genmacall\wstckl.svg", true); - - } - if (File.Exists("wstalr.svg")) - { - FileInfo fi2 = new FileInfo("wstalr.svg"); - fi2.CopyTo(tbResultPath.Text + @"genmacall\wstalr.svg", true); - - } + CopyFormat("wst1all.xml"); + CopyFormat("wst2all.xml"); + CopyFormat("wstcklall.xml"); + CopyFormat("wstalrall.xml"); + CopySVG("wst1.svg"); + CopySVG("wst2.svg"); + CopySVG("wstckl.svg"); + CopySVG("wstalr.svg"); MyStatus = string.Format("Copied Westinghouse Format/Genmac {0:F3} seconds", TimeSpan.FromTicks(DateTime.Now.Ticks - tStart.Ticks).TotalSeconds); MessageBox.Show("DONE Copy Westinghouse Format/Genmac - Results are in " + tbResultPath.Text + @"fmtall' and 'genmacall'"); } + private void CopyFormat(string fileName) + { + FileInfo fi1 = new FileInfo(Application.StartupPath + "\\" + fileName); + FileInfo fi2 = new FileInfo(@"..\..\" + fileName); + if (fi2.Exists && fi1.Exists && fi2.LastAccessTimeUtc > fi1.LastAccessTimeUtc) + { + fi2.CopyTo(fi1.FullName, true); + } + if (fi1.Exists) + { + FileInfo fio = new FileInfo(tbResultPath.Text + @"fmtall\" + fileName); + if (fio.Exists && fio.IsReadOnly) fio.IsReadOnly = false; + fi1.CopyTo(fio.FullName, true); + } + } + private void CopySVG(string fileName) + { + FileInfo fi1 = new FileInfo(Application.StartupPath + "\\" + fileName); + FileInfo fi2 = new FileInfo(@"..\..\" + fileName); + if (fi2.Exists && fi1.Exists && fi2.LastAccessTimeUtc > fi1.LastAccessTimeUtc) + { + if (fi1.Exists && fi1.IsReadOnly) fi1.IsReadOnly = false; + fi2.CopyTo(fi1.FullName, true); + } + if (fi1.Exists) + { + FileInfo fio = new FileInfo(tbResultPath.Text + @"genmacall\" + fileName); + if (fio.Exists && fio.IsReadOnly) fio.IsReadOnly = false; + fi1.CopyTo(fio.FullName, true); + } + } // old code: //private void button5_Click(object sender, System.EventArgs e) //{ diff --git a/PROMS/fmtxml/WSTALRall.xml b/PROMS/fmtxml/WSTALRall.xml index 7aa058bbea8dc210663955bec0aaf1be59a751ae..816395c6df4236bbd865c0477cba565ece51f7e4 100644 GIT binary patch delta 1842 zcmeHIO-K}B7=EXjwN(nUZA~|;*(E|_Mcp5DBa8J1ELI)-357DmEX1D;T`9?Bw=5|F z)82!J4tcOV7?BNi=pfR$pkv4F;;Cqrjvjixu~|izz|Jy!1K-a)&-1?T^L`WmvG3EQ z{B}*@G3kK5rX(%T+zNl(@5l*LFAY+JRBEIy8lWD|wg#jCf4A7V(^`KlNFfSRGc}M# zO>_~bS}}r{*YTqDf>h3{)_hADl~O5BXV^KJSqj`dXOQ}VHv~kLYN>~YsT;Fix&^LY z3e%wA;eBb48|mP0b-BE3Ig;%{I!39ATvSE@BV{6VH_uKe`bt*B&a-D-Jm+$7qR_!( z>N+QGoZzWOOdC+YxJl5Tx;r+^Q=RyaAM`Wq47AnL9e zO(z;$wE0cM(t>8}Hk%Ohdd$1%I^IJ(9kt0|Whqvqe~q?FdxqQ5RC|WoFx+8DkI((y zCyRUE`NqlW!fAbJ{=951=<33$3^{;%*xa33tW@An*Z+GHzl!L~U%?1GJp#Xq&TQKJ up}@uc+uSYsR(QY1c#B)t_?Ca_QBJ;kU}_cOd1*exlMDAbKBw^K_r5<{O_PcM delta 294 zcmX@q$K3FSX~QR$&Hq?Fuuh&J%(A&lutaq727RT;A?kl7Z|IPk>|nySxjE zD$FJf29x*p9R$;j{SU!(>V(T++Ir%BMw7{m-NKvoCJ8Xg`Y>cNFv+)j)ZF23-ap22TcGAP!-uMbl-$UHAO=9BaKv=%!|X4?F$r$T14z@{%uj7F2!?^d3? sVTamgzpZx65bov;J5<>)sx7BHm3bTFGR q7*D>-8a~;KLtyd)HW9FWKrx^{AihGfk3E1Pks%$TcXI>>2P**ilsgCj delta 228 zcmca1^FV4t9W%2rgVE$h=2m7y2E)nTtg>MGBug?Q=j4yfqO8UYW()?CeOaZUtkW#( zC*NQR0m?G63p1Kce#u%3VY34DGgtump_6miwV+}k-5@o=lYg-CD3>#&GGsEOGh{H7 zFxWCEF(fhMGvqL&09kenAq