Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Format adjustments for Prairie Island and Shearon Harris

Browse Source 
Added call to AddPlantSpecificOverrideAfterInheritance() when processing main formats and added changes for McGuire and Catawba
This commit is contained in:
John Jenko 2013-12-13 03:59:07 +00:00
parent 1dd61e449d
commit 82e0e37c3f
2 changed files with 134 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
PROMS/fmtxml/AppendPlantSpecific.cs
View File

@ -396,6 +396,19 @@ namespace fmtxml
private void AddNSPFMT(ref FormatData fmtdata) private void AddNSPFMT(ref FormatData fmtdata)
{ {
NSP_ArialFontInProcedures(ref 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 // Standard High Level step
fmtdata.StepData[2].Font.FontStyle = "Bold"; fmtdata.StepData[2].Font.FontStyle = "Bold";
// Caution // Caution
@ -946,6 +959,19 @@ namespace fmtxml
NSP_ArialFontInProcedures(ref fmtdata); NSP_ArialFontInProcedures(ref fmtdata);
fmtdata.ProcData.CoverTitleLength = 46; fmtdata.ProcData.CoverTitleLength = 46;
fmtdata.ProcData.ChangeBarData.FixedChangeColumn = 0; 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 // Base
fmtdata.StepData[0].Font.CPI = "12"; fmtdata.StepData[0].Font.CPI = "12";
// Substep // Substep
@ -1376,6 +1402,19 @@ namespace fmtxml
{ {
// Set the overall font to Arial 11 pt // Set the overall font to Arial 11 pt
NSP_ArialFontInProcedures(ref 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";
// High // High
fmtdata.StepData[2].Font.FontFamily = "Arial"; fmtdata.StepData[2].Font.FontFamily = "Arial";
fmtdata.StepData[2].Font.FontSize = "11"; fmtdata.StepData[2].Font.FontSize = "11";
@ -1476,6 +1515,19 @@ namespace fmtxml
{ {
// Set the overall font to Arial 11 pt // Set the overall font to Arial 11 pt
NSP_ArialFontInProcedures(ref 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";
// Caution1 // Caution1
fmtdata.StepData[20].Inactive = "True"; fmtdata.StepData[20].Inactive = "True";
// Caution2 // Caution2
@ -1501,7 +1553,7 @@ namespace fmtxml
fmtdata.ProcData.CoverTitleLength = 42; fmtdata.ProcData.CoverTitleLength = 42;
fmtdata.ProcData.CheckOffData.CheckOffList[0].NotOnEmpty = "True"; fmtdata.ProcData.CheckOffData.CheckOffList[0].NotOnEmpty = "True";
fmtdata.SectData.StepSectionData.StpSectLayData.ColRTable = "0,204,144"; 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.Ident = " {numeric}.";
fmtdata.StepData[2].TabData.RNOIdent = " ."; fmtdata.StepData[2].TabData.RNOIdent = " .";
fmtdata.StepData[4].TabData.RNOAdjustTabSize = 12; fmtdata.StepData[4].TabData.RNOAdjustTabSize = 12;
@ -3963,6 +4015,31 @@ namespace fmtxml
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">$</text>" + "<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">$</text>" +
"</g></svg>"); "</g></svg>");
myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[10]); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[10]);
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C7\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">S</text>" +
"</g></svg>");
myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[11]);
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C8\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">X</text>" +
"</g></svg>");
myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[12]);
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C9\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">C</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"M36\">" +
"<line x1=\"0\" y1=\"0\" x2=\"17\" y2=\"0\" stroke=\"black\" stroke-width=\"1.1\" />" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C0\">" +
"<ellipse cx=\"1\" cy=\"-3.2\" rx=\"11.1\" ry=\"11.1\" fill=\"none\" stroke=\"black\" stroke-width=\"1.9\" />" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
} }
private void AddNSPDEV(XmlDocument myDoc) 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]); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[11]);
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C7\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">S</text>" +
"</g></svg>");
myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[12]);
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C8\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">X</text>" +
"</g></svg>");
myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[13]);
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C9\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">C</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"M36\">" + xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"M36\">" +
"<line x1=\"0\" y1=\"0\" x2=\"17\" y2=\"0\" stroke=\"black\" stroke-width=\"1.1\" />" + "<line x1=\"0\" y1=\"0\" x2=\"17\" y2=\"0\" stroke=\"black\" stroke-width=\"1.1\" />" +
"</g></svg>"); "</g></svg>");
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("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"\">" + xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"\">" +
"</g></svg>"); "</g></svg>");
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) 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]); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[11]);
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C7\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">S</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C8\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">X</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C9\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">C</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
} }
private void AddNSPSAM(XmlDocument myDoc) 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]); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[8]);
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C7\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">S</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C8\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">X</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C9\">" +
"<text x=\"-32.55\" y=\"0\" font-family=\"Arial\" font-size=\"10\">C</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
} }
} }
} }

9
PROMS/fmtxml/FmtFileToXml.cs
View File

@ -4378,6 +4378,7 @@ namespace fmtxml
{ {
//success = WriteOutXmlTmp(fmtdata, "beforeParent"); //success = WriteOutXmlTmp(fmtdata, "beforeParent");
success = CompareParentSub(BaseFormat, ref fmtdata); success = CompareParentSub(BaseFormat, ref fmtdata);
AddPlantSpecificOverrideAfterInheritance(fname, ref fmtdata);
success = WriteOutXml(fmtdata); success = WriteOutXml(fmtdata);
// For each sub-format, load the entire file & compare to parent contents // For each sub-format, load the entire file & compare to parent contents
@ -4423,6 +4424,14 @@ namespace fmtxml
case "CPL.X03": case "CPL.X03":
OverrideCPL_X03(ref fmtdata); OverrideCPL_X03(ref fmtdata);
break; break;
case "MCG.FMT":
case "MCGBOX.FMT":
AddMCGfmtOVR(ref fmtdata);
break;
case "CAT.FMT":
case "CATBOX.FMT":
AddCATfmtOVR(ref fmtdata);
break;
} }
} }