From 82e0e37c3ff4f031f6b0e7b4defb76eee3ee6edc Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Dec 2013 03:59:07 +0000 Subject: [PATCH] Format adjustments for Prairie Island and Shearon Harris Added call to AddPlantSpecificOverrideAfterInheritance() when processing main formats and added changes for McGuire and Catawba --- PROMS/fmtxml/AppendPlantSpecific.cs | 128 +++++++++++++++++++++++++++- PROMS/fmtxml/FmtFileToXml.cs | 9 ++ 2 files changed, 134 insertions(+), 3 deletions(-) diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index f385f917..6244148e 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -396,6 +396,19 @@ namespace fmtxml private void AddNSPFMT(ref FormatData fmtdata) { NSP_ArialFontInProcedures(ref fmtdata); + // checkoffs + fmtdata.ProcData.CheckOffData.CheckOffList[7].Index = 7; + fmtdata.ProcData.CheckOffData.CheckOffList[7].UIMark = 83; + fmtdata.ProcData.CheckOffData.CheckOffList[7].MenuItem = "S"; + fmtdata.ProcData.CheckOffData.CheckOffList[7].Macro = "C7"; + fmtdata.ProcData.CheckOffData.CheckOffList[8].Index = 8; + fmtdata.ProcData.CheckOffData.CheckOffList[8].UIMark = 88; + fmtdata.ProcData.CheckOffData.CheckOffList[8].MenuItem = "X"; + fmtdata.ProcData.CheckOffData.CheckOffList[8].Macro = "C8"; + fmtdata.ProcData.CheckOffData.CheckOffList[9].Index = 9; + fmtdata.ProcData.CheckOffData.CheckOffList[9].UIMark = 67; + fmtdata.ProcData.CheckOffData.CheckOffList[9].MenuItem = "C"; + fmtdata.ProcData.CheckOffData.CheckOffList[9].Macro = "C9"; // Standard High Level step fmtdata.StepData[2].Font.FontStyle = "Bold"; // Caution @@ -946,6 +959,19 @@ namespace fmtxml NSP_ArialFontInProcedures(ref fmtdata); fmtdata.ProcData.CoverTitleLength = 46; fmtdata.ProcData.ChangeBarData.FixedChangeColumn = 0; + // checkoffs + fmtdata.ProcData.CheckOffData.CheckOffList[7].Index = 7; + fmtdata.ProcData.CheckOffData.CheckOffList[7].UIMark = 83; + fmtdata.ProcData.CheckOffData.CheckOffList[7].MenuItem = "S"; + fmtdata.ProcData.CheckOffData.CheckOffList[7].Macro = "C7"; + fmtdata.ProcData.CheckOffData.CheckOffList[8].Index = 8; + fmtdata.ProcData.CheckOffData.CheckOffList[8].UIMark = 88; + fmtdata.ProcData.CheckOffData.CheckOffList[8].MenuItem = "X"; + fmtdata.ProcData.CheckOffData.CheckOffList[8].Macro = "C8"; + fmtdata.ProcData.CheckOffData.CheckOffList[9].Index = 9; + fmtdata.ProcData.CheckOffData.CheckOffList[9].UIMark = 67; + fmtdata.ProcData.CheckOffData.CheckOffList[9].MenuItem = "C"; + fmtdata.ProcData.CheckOffData.CheckOffList[9].Macro = "C8"; // Base fmtdata.StepData[0].Font.CPI = "12"; // Substep @@ -1376,6 +1402,19 @@ namespace fmtxml { // Set the overall font to Arial 11 pt NSP_ArialFontInProcedures(ref fmtdata); + // checkoffs + fmtdata.ProcData.CheckOffData.CheckOffList[7].Index = 7; + fmtdata.ProcData.CheckOffData.CheckOffList[7].UIMark = 83; + fmtdata.ProcData.CheckOffData.CheckOffList[7].MenuItem = "S"; + fmtdata.ProcData.CheckOffData.CheckOffList[7].Macro = "C7"; + fmtdata.ProcData.CheckOffData.CheckOffList[8].Index = 8; + fmtdata.ProcData.CheckOffData.CheckOffList[8].UIMark = 88; + fmtdata.ProcData.CheckOffData.CheckOffList[8].MenuItem = "X"; + fmtdata.ProcData.CheckOffData.CheckOffList[8].Macro = "C8"; + fmtdata.ProcData.CheckOffData.CheckOffList[9].Index = 9; + fmtdata.ProcData.CheckOffData.CheckOffList[9].UIMark = 67; + fmtdata.ProcData.CheckOffData.CheckOffList[9].MenuItem = "C"; + fmtdata.ProcData.CheckOffData.CheckOffList[9].Macro = "C9"; // High fmtdata.StepData[2].Font.FontFamily = "Arial"; fmtdata.StepData[2].Font.FontSize = "11"; @@ -1476,6 +1515,19 @@ namespace fmtxml { // Set the overall font to Arial 11 pt NSP_ArialFontInProcedures(ref fmtdata); + // checkoffs + fmtdata.ProcData.CheckOffData.CheckOffList[7].Index = 7; + fmtdata.ProcData.CheckOffData.CheckOffList[7].UIMark = 83; + fmtdata.ProcData.CheckOffData.CheckOffList[7].MenuItem = "S"; + fmtdata.ProcData.CheckOffData.CheckOffList[7].Macro = "C7"; + fmtdata.ProcData.CheckOffData.CheckOffList[8].Index = 8; + fmtdata.ProcData.CheckOffData.CheckOffList[8].UIMark = 88; + fmtdata.ProcData.CheckOffData.CheckOffList[8].MenuItem = "X"; + fmtdata.ProcData.CheckOffData.CheckOffList[8].Macro = "C8"; + fmtdata.ProcData.CheckOffData.CheckOffList[9].Index = 9; + fmtdata.ProcData.CheckOffData.CheckOffList[9].UIMark = 67; + fmtdata.ProcData.CheckOffData.CheckOffList[9].MenuItem = "C"; + fmtdata.ProcData.CheckOffData.CheckOffList[9].Macro = "C9"; // Caution1 fmtdata.StepData[20].Inactive = "True"; // Caution2 @@ -1501,7 +1553,7 @@ namespace fmtxml fmtdata.ProcData.CoverTitleLength = 42; fmtdata.ProcData.CheckOffData.CheckOffList[0].NotOnEmpty = "True"; fmtdata.SectData.StepSectionData.StpSectLayData.ColRTable = "0,204,144"; - fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAlt = "0,186,0"; + fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAlt = "0,193,0"; fmtdata.StepData[2].TabData.Ident = " {numeric}."; fmtdata.StepData[2].TabData.RNOIdent = " ."; fmtdata.StepData[4].TabData.RNOAdjustTabSize = 12; @@ -3963,6 +4015,31 @@ namespace fmtxml "$" + ""); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[10]); + + xdNew.LoadXml(" " + + "S" + +""); + myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[11]); + + xdNew.LoadXml(" " + + "X" + +""); + myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[12]); + + xdNew.LoadXml(" " + + "C" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + + xdNew.LoadXml(" " + + "" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + + xdNew.LoadXml(" " + + "" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); } private void AddNSPDEV(XmlDocument myDoc) @@ -4117,16 +4194,31 @@ namespace fmtxml myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[11]); + xdNew.LoadXml(" " + + "S" + +""); + myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[12]); + + xdNew.LoadXml(" " + + "X" + +""); + myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[13]); + + xdNew.LoadXml(" " + + "C" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + xdNew.LoadXml(" " + "" + ""); - myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[12]); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); xdNew.LoadXml(" " + ""); - myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[13]); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); } private void AddNSPIFG(XmlDocument myDoc) @@ -4195,6 +4287,21 @@ namespace fmtxml myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[11]); + xdNew.LoadXml(" " + + "S" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + + xdNew.LoadXml(" " + + "X" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + + xdNew.LoadXml(" " + + "C" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + } private void AddNSPSAM(XmlDocument myDoc) { @@ -4259,6 +4366,21 @@ namespace fmtxml myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[8]); + xdNew.LoadXml(" " + + "S" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + + xdNew.LoadXml(" " + + "X" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + + xdNew.LoadXml(" " + + "C" + +""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + } } } diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index d102ca08..c8ce7459 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -4378,6 +4378,7 @@ namespace fmtxml { //success = WriteOutXmlTmp(fmtdata, "beforeParent"); success = CompareParentSub(BaseFormat, ref fmtdata); + AddPlantSpecificOverrideAfterInheritance(fname, ref fmtdata); success = WriteOutXml(fmtdata); // For each sub-format, load the entire file & compare to parent contents @@ -4423,6 +4424,14 @@ namespace fmtxml case "CPL.X03": OverrideCPL_X03(ref fmtdata); break; + case "MCG.FMT": + case "MCGBOX.FMT": + AddMCGfmtOVR(ref fmtdata); + break; + case "CAT.FMT": + case "CATBOX.FMT": + AddCATfmtOVR(ref fmtdata); + break; } }