From 7cbe3f651f3a1017084f03ec6ebded4c7aa89905 Mon Sep 17 00:00:00 2001 From: Kathy Date: Wed, 25 Sep 2013 16:06:09 +0000 Subject: [PATCH] Callaway improvements Callaway improvements (ReadOnly step format property) Initial FNPNMP Initial fnpnmp --- PROMS/fmtxml/AppendPlantSpecific.cs | 37 ++++++++++++++++++++++++++++ PROMS/fmtxml/FNPNMPall.xml | Bin 0 -> 60426 bytes PROMS/fmtxml/FmtFileToXml.cs | 3 +++ PROMS/fmtxml/Form1.cs | 6 ++++- PROMS/fmtxml/TranslateFMT.XSL | Bin 202152 -> 202548 bytes PROMS/fmtxml/fnpnmp.svg | Bin 0 -> 2980 bytes 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 PROMS/fmtxml/FNPNMPall.xml create mode 100644 PROMS/fmtxml/fnpnmp.svg diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index c7366db0..88ed1c8f 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -112,6 +112,9 @@ namespace fmtxml case "CALOTO.FMT": AddCAL2fmt(ref fmtdata); break; + case "CALBCK.FMT": + AddCALBCKfmt(ref fmtdata); + break; case "FNP.FMT": AddFNPfmt(ref fmtdata); break; @@ -135,6 +138,21 @@ namespace fmtxml break; } } + + private void AddCALBCKfmt(ref FormatData fmtdata) + { + fmtdata.StepData[42].ReadOnly = "True"; + fmtdata.StepData[43].ReadOnly = "True"; + fmtdata.StepData[2].TabData.IdentAltPrint = @"\ul EOP STEP:\ulnone \STEP: "; + fmtdata.StepData[2].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; + fmtdata.StepData[6].TabData.IdentAltPrint = @"\ul EOP STEP:\ulnone \STEP: "; + fmtdata.StepData[6].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; + fmtdata.StepData[7].TabData.IdentAltPrint = @"\ul EOP STEP:\ulnone \STEP: "; + fmtdata.StepData[7].TabData.RNOIdent = @"\ul WOG ERG STEP:\ulnone "; + fmtdata.StepData[6].WidthOverride = "490"; + fmtdata.StepData[7].WidthOverride = "490"; + fmtdata.StepData[24].WidthOverride = "490"; + } private void AddFNPfmt(ref FormatData fmtdata) { fmtdata.SectData.StepSectionData.StpSectLayData.WidSTableEdit = "445,186,120"; @@ -1516,6 +1534,9 @@ namespace fmtxml case "CAL2.PAG": AddCAL2Page(ref pgstyles); break; + case "CALBCK.PAG": + AddCALBCKPage(ref pgstyles); + break; case "CPLRDEV.PAG": AddCPLRDevPage(ref pgstyles); break; @@ -1534,6 +1555,13 @@ namespace fmtxml } } + private void AddCALBCKPage(ref PageStyles pgstyles) + { + pgstyles.PgStyles[1].Items[3].Style.FontSize = "14"; + pgstyles.PgStyles[1].Items[4].Style.FontSize = "14"; + pgstyles.PgStyles[0].Items[7].Col = 518; + } + private void AddCAL2Page(ref PageStyles pgstyles) { pgstyles.PgStyles[6].Items[2].Col = 240; @@ -2953,6 +2981,9 @@ namespace fmtxml case "CAL2.Y00": AddCAL2DOC(ref dcstyles); break; + case "CALBCK.DOC": + AddCALBCKDOC(ref dcstyles); + break; case "CPL.DOC": AddCPLDOC(ref dcstyles); break; @@ -2971,6 +3002,12 @@ namespace fmtxml } } + private void AddCALBCKDOC(ref DocStyles dcstyles) + { + dcstyles.DcStyles[0].PageWidth = 560; + dcstyles.DcStyles[0].ContTop = ""; + } + private void AddCAL2DOC(ref DocStyles dcstyles) { dcstyles.DcStyles[1].PageLength = 672; diff --git a/PROMS/fmtxml/FNPNMPall.xml b/PROMS/fmtxml/FNPNMPall.xml new file mode 100644 index 0000000000000000000000000000000000000000..9fc337d1f0ac66b9130daaefa93243c0e1b5d798 GIT binary patch literal 60426 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 literal 0 HcmV?d00001 diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 2b912649..08a43a58 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -871,6 +871,7 @@ public struct Step public int Index; public string Type; public string ParentType; + public string ReadOnly; public string Inactive; public string ColOverride; public string ColOverrideEdit; @@ -5202,6 +5203,7 @@ namespace fmtxml #endregion #region DoStepInherit delegate string StepPartStr(Step stp); + private string StepPartReadOnly(Step stp) { return stp.ReadOnly; } private string StepPartInactive(Step stp) { return stp.Inactive; } private string StepPartColOverride(Step stp) { return stp.ColOverride; } private string StepPartColOverrideEdit(Step stp) { return stp.ColOverrideEdit; } @@ -5417,6 +5419,7 @@ namespace fmtxml private void FixInheritance(ref Step step, Dictionary dicParents) { + if (CheckInheritedStr(new StepPartStr(StepPartReadOnly), step, dicParents)) step.ReadOnly = null; if (CheckInheritedStr(new StepPartStr(StepPartInactive), step, dicParents)) step.Inactive = null; if (CheckInheritedStr(new StepPartStr(StepPartColOverride), step, dicParents)) step.ColOverride = NullString; if (CheckInheritedStr(new StepPartStr(StepPartColOverrideEdit), step, dicParents)) step.ColOverrideEdit = NullString; diff --git a/PROMS/fmtxml/Form1.cs b/PROMS/fmtxml/Form1.cs index 1b5c1d65..630fc305 100644 --- a/PROMS/fmtxml/Form1.cs +++ b/PROMS/fmtxml/Form1.cs @@ -304,7 +304,7 @@ namespace fmtxml this.btnWestinghouse.Name = "btnWestinghouse"; this.btnWestinghouse.Size = new System.Drawing.Size(164, 26); this.btnWestinghouse.TabIndex = 21; - this.btnWestinghouse.Text = "Copy Westinghouse Fmt Gen"; + this.btnWestinghouse.Text = "Copy New Formats"; this.btnWestinghouse.UseVisualStyleBackColor = true; this.btnWestinghouse.Click += new System.EventHandler(this.btnWestinghouse_Click); // @@ -604,6 +604,10 @@ namespace fmtxml CopySVG("wstalr.svg"); CopySVG("wstbck.svg"); CopySVG("wstdcs.svg"); + + CopyFormat("fnpnmpall.xml"); + CopySVG("fnpnmp.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'"); } diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index dae5471557b78014cb62c674cb160386dd5844e3..57a4dd9eebac70c6e04e38f19b7d346bd2a8db89 100644 GIT binary patch delta 69 zcmV-L0J{IEs|>WR41lx&%H9uB0A&DS0Av790B!(m0C~5^-T|=|lh(QrlQL5%m$3B# bR+Au(1e1Wf43{#L0^Wyu^#Qkf^#U#+vtJv_ delta 27 jcmdn8j%USco`x-qr|xaPbB}SISUbyi#_cTMnG6&FzcCDG diff --git a/PROMS/fmtxml/fnpnmp.svg b/PROMS/fmtxml/fnpnmp.svg new file mode 100644 index 0000000000000000000000000000000000000000..e8a56701018764649dc3c644738e0bcf4f768364 GIT binary patch literal 2980 zcmdT`%TgLq5Ix&iF(R_K7D__o#7k{JYkFobM!I66eBz%!518$fkV{!8bVc-z+O16KC6| zB;v&EQq8PR%Kn%-5>{PZ*09<)ahmF1rWDtC3r3{g2>FiU{n@>X>g=LUp^M(@otr-S z@4fMJuv~fUBKRBr9WiHqQhh%2`3ohy$3nfxuwu6(0McTJ6pG^AgqOPnfs~ zB`$M_x(+33tgXWxhltu8?mdr+Zljbj(bIREp)eCgL|j*k?XeaSaotR+KQ_&y?>E;? zRrI>Y(F`lLN6`8Wru*7twNjSW)vH6gn}*_6&N$WAOj}I*H)2nE%-$ZcHm#Rbf6j=Z zi(p&VaANwF)R}GXf$iKGZ#o0+*C)eomy@sDza!Gdb}Ez89qKjR$_?|ei!0pFV!W~$ z`tkqujy84}K{=D|F6Sno`fOe^ySl6DrW)Zgt&na%@}&0%nHB~W(Lay