diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index 4f70ef92..f385f917 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -182,6 +182,7 @@ namespace fmtxml { fmtdata.StepData[42].ReadOnly = "True"; fmtdata.StepData[43].ReadOnly = "True"; + fmtdata.StepData[43].ChildIndent = "14.4"; // 2 characters at 10 cpi 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: "; @@ -331,10 +332,48 @@ namespace fmtxml { // RGE is now call CEG //\u160? fmtdata.Name = "CEG Ginna Background Format"; - //fmtdata.TPL = "0 0 title\r\n1 1 \r\n2 41 PURPOSE: \r\n2 42 BASIS:\r\n2 42 SUPPLEMENTAL INFORMATION:\r\n2 42 DEVIATION/JUSTIFICATION:\r\n2 42 REFERENCES:\r\n1 39 \xA0\r\n0 0 title\r\n1 5 \r\n2 41 PURPOSE: \r\n2 42 BASIS:\r\n2 42 SUPPLEMENTAL INFORMATION:\r\n2 42 DEVIATION/JUSTIFICATION:\r\n2 42 REFERENCES:\r\n1 39 \xA0\r\n0 0 title\r\n1 6 \r\n2 41 PURPOSE: \r\n2 42 BASIS:\r\n2 42 SUPPLEMENTAL INFORMATION:\r\n2 42 DEVIATION/JUSTIFICATION:\r\n2 42 REFERENCES:\r\n1 39 \xA0\r\n"; - //fmtdata.StepData[2].UseOldTemplate = "True"; - //fmtdata.StepData[6].UseOldTemplate = "True"; - //fmtdata.StepData[7].UseOldTemplate = "True"; + fmtdata.TPL = "0 0 title\r\n1 1 \r\n2 41 PURPOSE: \r\n2 42 BASIS:\r\n2 42 SUPPLEMENTAL INFORMATION:\r\n2 42 DEVIATION/JUSTIFICATION:\r\n2 42 REFERENCES:\r\n1 39 \xA0\r\n0 0 title\r\n1 5 \r\n2 41 PURPOSE: \r\n2 42 BASIS:\r\n2 42 SUPPLEMENTAL INFORMATION:\r\n2 42 DEVIATION/JUSTIFICATION:\r\n2 42 REFERENCES:\r\n1 39 \xA0\r\n0 0 title\r\n1 6 \r\n2 41 PURPOSE: \r\n2 42 BASIS:\r\n2 42 SUPPLEMENTAL INFORMATION:\r\n2 42 DEVIATION/JUSTIFICATION:\r\n2 42 REFERENCES:\r\n1 39 \xA0\r\n"; + // High + fmtdata.StepData[2].ColOverride = "66"; + fmtdata.StepData[2].UseOldTemplate = "True"; + // Imediate + fmtdata.StepData[3].ColOverride = "66"; + // Continuous + fmtdata.StepData[9].ColOverride = "66"; + // Loss of AC + fmtdata.StepData[18].ColOverride = "66"; + // High 5 + fmtdata.StepData[41].ColOverride = "66"; + // And + fmtdata.StepData[4].StepLayoutData.STExtraSpace = "0"; + // Explicate And + fmtdata.StepData[45].StepLayoutData.STExtraSpace = "0"; + // ContAcAnd + fmtdata.StepData[19].StepLayoutData.STExtraSpace = "0"; + // OR + fmtdata.StepData[5].StepLayoutData.STExtraSpace = "0"; + // Implicate OR + fmtdata.StepData[35].StepLayoutData.STExtraSpace = "0"; + // ContAcOR + fmtdata.StepData[46].StepLayoutData.STExtraSpace = "0"; + // Caution + fmtdata.StepData[6].UseOldTemplate = "True"; + //Note + fmtdata.StepData[7].UseOldTemplate = "True"; + // Paragraph + fmtdata.StepData[24].StepLayoutData.STExtraSpace = "0"; + // RNO + fmtdata.StepData[40].StepLayoutData.AlignWithParentTab = "True"; + fmtdata.StepData[40].ColOverride = "66"; + // TitleWithTextRight + fmtdata.StepData[42].ReadOnly = "True"; + fmtdata.StepData[42].ColOverride = "66"; + fmtdata.StepData[42].StepLayoutData.STExtraSpace = "0"; + // TitleWithTextBelow + fmtdata.StepData[43].ReadOnly = "True"; + fmtdata.StepData[43].ColOverride = "66"; + fmtdata.StepData[43].WidthOverride = "468"; + fmtdata.StepData[43].StepLayoutData.STExtraSpace = "0"; } private void AddRGEBCKX00(ref FormatData fmtdata) { @@ -1016,6 +1055,8 @@ namespace fmtxml fmtdata.StepData[28].Inactive = "True"; // Note5 fmtdata.StepData[32].Inactive = "True"; + // RNO + fmtdata.StepData[40].Font.FontFamily = "Consolas"; } private void AddNSPDEVFMT(ref FormatData fmtdata) @@ -1597,6 +1638,9 @@ namespace fmtxml case "RGE.PAG": AddRGEPage(ref pgstyles); break; + case "RGEBCK.PAG": + AddRGEBCKPage(ref pgstyles); + break; case "VCSDEV.PAG": AddVCSDEVfmt(ref pgstyles); break; @@ -2928,6 +2972,20 @@ namespace fmtxml // Procedure Steps pgstyles.PgStyles[0].Items[4].Col = 30; // EOPNUM } + private void AddRGEBCKPage(ref PageStyles pgstyles) + { + // Procedure Steps + pgstyles.PgStyles[0].Items[1].Token = @"\ul STEP DESCRIPTION TABLE FOR {EOPNUM}\ulnone {CM:(Cont)}"; + // Cover page + pgstyles.PgStyles[1].Items[8].Col = 432; // REV + // Revision Page / Table of Contents + pgstyles.PgStyles[2].Items[1].Row = 738; // EOPNUM + pgstyles.PgStyles[2].Items[2].Row = 738; // REV + //Revision Page / Table of Contents (After first page) + pgstyles.PgStyles[5].Items[1].Row = 738; // EOPNUM + pgstyles.PgStyles[5].Items[2].Row = 738; // ROMANPAGE + pgstyles.PgStyles[5].Items[3].Row = 738; // REV + } private void AddRGESam1Page(ref PageStyles pgstyles) { @@ -3083,13 +3141,16 @@ namespace fmtxml switch (genFileName.ToUpper()) { case "RGESAM1.DOC": - AddREGSam1DOC(ref dcstyles); + AddRGESam1DOC(ref dcstyles); break; case "RGESAM2.DOC": - AddREGSam2DOC(ref dcstyles); + AddRGESam2DOC(ref dcstyles); break; case "RGE.DOC": - AddREGDOC(ref dcstyles); + AddRGEDOC(ref dcstyles); + break; + case "RGEBCK.DOC": + AddRGEBCKDOC(ref dcstyles); break; // in shearon harris format, the fonts were set to 0 in the 16bit docstyle. // we want them to inherit from plant format, not use the Prestige Elite (font 0) @@ -3330,22 +3391,31 @@ namespace fmtxml dcstyles.DcStyles[9].dstyle.CPI = "12"; } - public void AddREGSam1DOC(ref DocStyles dcstyles) + public void AddRGESam1DOC(ref DocStyles dcstyles) { dcstyles.DcStyles[4].numberingsequence = 1; // count this section with total document page count } - public void AddREGSam2DOC(ref DocStyles dcstyles) + public void AddRGESam2DOC(ref DocStyles dcstyles) { dcstyles.DcStyles[2].numberingsequence = 1; // count this section with total document page count } - public void AddREGDOC(ref DocStyles dcstyles) + public void AddRGEDOC(ref DocStyles dcstyles) { // Introduction pages dcstyles.DcStyles[1].PageWidth = 591; // needed to increase to match 16-bit word wrapping // Attachment Pages dcstyles.DcStyles[2].PageWidth = 601; // needed to increase to match 16-bit word wrapping } + public void AddRGEBCKDOC(ref DocStyles dcstyles) + { + // Revision Page / Table of Contents + dcstyles.DcStyles[2].TopMargin = 55; + // Revision Page / Table of Contents (after first page) + dcstyles.DcStyles[3].TopMargin = 91; + // Introduction Pages + dcstyles.DcStyles[4].PageWidth = 578; + } public void AddWCN1Doc(ref DocStyles dcstyles) { diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 1c27f244..d102ca08 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -933,6 +933,7 @@ public struct Step public string NumberHighLevel; // NumberHighLevelRNO public string OffsetTab; public string AdjHighLevelTab; // Added for FNP - high level RNO + public string ChildIndent; // Added for Callaway Backgrounds public string LeftJustifyBorderless; // LJBorderlessTable public string StepNumIfOnlyOne; // NoStepNumIfOnlyOneStep public string LJTabs; @@ -3360,6 +3361,8 @@ namespace fmtxml lastIndex = match.Index + match.Length; } sb.Append(str.Substring(lastIndex)); + if (!str.Substring(lastIndex).EndsWith("\n")) + sb.Append("\n"); return sb.ToString(); } @@ -5354,6 +5357,7 @@ namespace fmtxml private string StepPartNumberHighLevel(Step stp) { return stp.NumberHighLevel; } private string StepPartOffsetTab(Step stp) { return stp.OffsetTab; } private string StepPartAdjHighLevelTab(Step stp) { return stp.AdjHighLevelTab; } + private string StepPartChildIndent(Step stp) { return stp.ChildIndent; } private string StepPartLeftJustifyBorderless(Step stp) { return stp.LeftJustifyBorderless; } private string StepPartStepNumIfOnlyOne(Step stp) { return stp.StepNumIfOnlyOne; } private string StepPartLJTabs(Step stp) { return stp.LJTabs; } @@ -5604,6 +5608,7 @@ namespace fmtxml if (CheckInheritedStr(new StepPartStr(StepPartNumberHighLevel), step, dicParents)) step.NumberHighLevel = null; if (CheckInheritedStr(new StepPartStr(StepPartOffsetTab), step, dicParents)) step.OffsetTab = null; if (CheckInheritedStr(new StepPartStr(StepPartAdjHighLevelTab), step, dicParents)) step.AdjHighLevelTab = null; + if (CheckInheritedStr(new StepPartStr(StepPartChildIndent), step, dicParents)) step.ChildIndent = null; if (CheckInheritedStr(new StepPartStr(StepPartLeftJustifyBorderless), step, dicParents)) step.LeftJustifyBorderless = null; if (CheckInheritedStr(new StepPartStr(StepPartStepNumIfOnlyOne), step, dicParents)) step.StepNumIfOnlyOne = null; if (CheckInheritedStr(new StepPartStr(StepPartLJTabs), step, dicParents)) step.LJTabs = null; diff --git a/PROMS/fmtxml/PlantSpecific_McGuire.cs b/PROMS/fmtxml/PlantSpecific_McGuire.cs index bea1f268..e094250d 100644 --- a/PROMS/fmtxml/PlantSpecific_McGuire.cs +++ b/PROMS/fmtxml/PlantSpecific_McGuire.cs @@ -9,10 +9,17 @@ namespace fmtxml { private void AddMCGfmt(ref FormatData fmtdata) // McGuire { - fmtdata.SectData.StepSectionData.StpSectLayData.Separator.SeparatorLocation = 2; + //fmtdata.SectData.StepSectionData.StpSectLayData.Separator.SeparatorLocation = 2; + fmtdata.SectData.StepSectionData.StpSectLayData.ColT = 33; + + // Base + fmtdata.StepData[0].StepLayoutData.STExtraSpace = "0"; + + // High + fmtdata.StepData[2].StepLayoutData.STExtraSpace = "12"; // caution separator - fmtdata.StepData[6].StepLayoutData.STBoxindex = "1"; + //fmtdata.StepData[6].StepLayoutData.STBoxindex = "1"; fmtdata.StepData[6].TabData.Bullet.Separate = "True"; fmtdata.StepData[6].TabData.Bullet.Font = new VE_Font(); fmtdata.StepData[6].TabData.Bullet.Font.FontFamily = "Arial"; @@ -21,7 +28,7 @@ namespace fmtxml fmtdata.StepData[6].TabData.Bullet.Font.CPI = "12"; // note location/tab - fmtdata.StepData[7].StepLayoutData.STBoxindex = "1"; + //fmtdata.StepData[7].StepLayoutData.STBoxindex = "1"; fmtdata.StepData[7].TabData.Ident = "NOTE: "; fmtdata.StepData[7].TabData.Bullet.Separate = "True"; fmtdata.StepData[7].TabData.Bullet.Font = new VE_Font(); @@ -33,14 +40,35 @@ namespace fmtxml // RNOType fmtdata.StepData[40].Font.FontFamily = "Arial"; fmtdata.StepData[40].Font.FontSize = "11"; + fmtdata.StepData[40].StepLayoutData.STExtraSpace = "0"; // note location (create a box to locate it) - fmtdata.BoxData[1].Index = 1; - fmtdata.BoxData[1].Start = 6; - fmtdata.BoxData[1].End = 240; - fmtdata.BoxData[1].TxtStart = 12; - fmtdata.BoxData[1].TxtWidth = 450; - fmtdata.BoxData[1].BXULC = " "; + //fmtdata.BoxData[1].Index = 1; + //fmtdata.BoxData[1].Start = 6; + //fmtdata.BoxData[1].End = 240; + //fmtdata.BoxData[1].TxtStart = 12; + //fmtdata.BoxData[1].TxtWidth = 450; + //fmtdata.BoxData[1].BXULC = " "; + + //Disable extra Cautions and notes + // Caution 1 + fmtdata.StepData[20].Inactive = "True"; + // Caution 2 + fmtdata.StepData[21].Inactive = "True"; + // Caution 3 + fmtdata.StepData[27].Inactive = "True"; + // Caution 4 + fmtdata.StepData[29].Inactive = "True"; + // Note 1 + fmtdata.StepData[22].Inactive = "True"; + // Note 2 + fmtdata.StepData[23].Inactive = "True"; + // Note 3 + fmtdata.StepData[26].Inactive = "True"; + // Note 4 + fmtdata.StepData[28].Inactive = "True"; + // Note 5 + fmtdata.StepData[32].Inactive = "True"; } } public partial class FmtToXml diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 77766e88..3e57811d 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ