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 00000000..9fc337d1 Binary files /dev/null and b/PROMS/fmtxml/FNPNMPall.xml differ 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 dae54715..57a4dd9e 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ diff --git a/PROMS/fmtxml/fnpnmp.svg b/PROMS/fmtxml/fnpnmp.svg new file mode 100644 index 00000000..e8a56701 Binary files /dev/null and b/PROMS/fmtxml/fnpnmp.svg differ