diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 2bd23786..10b8fa32 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -2648,6 +2648,9 @@ namespace Volian.Print.Library CheckOffAdj = -(float)formatInfo.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffAdjustment; if (!HasCheckOffHeading(itemInfo, formatInfo) && CheckOffAdj < 0) CheckOffAdj += (float)(9 * 7.2); // 9 is the size of the SIGNOFF adjustment + else if (HasCheckOffHeading(itemInfo, formatInfo)) + // For Robinson, tried using font's CharsToTwips but it made it too narrow, so used hardcoded 6: + CheckOffAdj = -((float)9 * 6); } float adjwidth = CheckOffAdj; SectData sd = formatInfo.PlantFormat.FormatData.SectData; diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index ae106f49..bb9927ba 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -1602,9 +1602,11 @@ namespace fmtxml case "CPL.Z00": case "CPL.Z01": case "CPL.Z02": - case "CPL.Z03": SetRobinsonPageListFont(ref pgstyles); break; + case "CPL.Z03": + AddCPL_Z03(ref pgstyles); + break; case "CPBCK.PAG": AddCPBCK(ref pgstyles); break; @@ -3107,7 +3109,7 @@ namespace fmtxml AddCPL_Y02(ref dcstyles); break; case "CPL.Y03": - SetRobinsonDocStyleFont(ref dcstyles); + AddCPL_Y03(ref dcstyles); break; case "CPLA.DOC": AddCPLA(ref dcstyles); diff --git a/PROMS/fmtxml/PlantSpecific_Robinson.cs b/PROMS/fmtxml/PlantSpecific_Robinson.cs index b72ed3e2..c1d77c22 100644 --- a/PROMS/fmtxml/PlantSpecific_Robinson.cs +++ b/PROMS/fmtxml/PlantSpecific_Robinson.cs @@ -88,8 +88,8 @@ namespace fmtxml private void AddCPL_X01(ref FormatData fmtdata) // Robinson { Robinson_ArialFontInProcedures(ref fmtdata); - fmtdata.SectData.StepSectionData.StpSectLayData.WidSTableEdit = "400,195,114"; - fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "400,195,114"; + fmtdata.SectData.StepSectionData.StpSectLayData.WidSTableEdit = "380,195,114"; + fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "380,195,114"; // Unnumber High level Step fmtdata.StepData[18].BoxIt = "False"; fmtdata.StepData[18].StepEditData.TypeMenu.MenuItem = "Unnumbered Step"; @@ -199,6 +199,8 @@ namespace fmtxml { //Robinson_ArialFontInProcedures(ref fmtdata); fmtdata.Name = "Duke Energy - Robinson Enhanced Background Additional Styles"; + fmtdata.SectData.StepSectionData.StpSectLayData.WidSTableEdit = "496,216,144"; + fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "496,216,144"; } @@ -593,25 +595,51 @@ namespace fmtxml pgstyles.PgStyles[3].Items[7].Col = 232; pgstyles.PgStyles[3].Items[8].Col = 235; } + private void AddCPL_Z03(ref PageStyles pgstyles) + { + pgstyles.Name = "Duke Energy - Robinson Duplex Foldout Page Style"; + } private void AddCPBCK(ref PageStyles pgstyles) { //SetRobinsonPageListFont(ref pgstyles); pgstyles.Name = "Duke Energy - Robinson Enhanced Background Page Styles"; + // Step Description Table + pgstyles.PgStyles[0].Items[7].Col = 276; + pgstyles.PgStyles[0].Items[8].Col = 525; + // Cover Page + pgstyles.PgStyles[1].Items[2].Token = "DUKE ENERGY"; + pgstyles.PgStyles[1].Items[2].Col = 260; + pgstyles.PgStyles[1].Items[3].Col = 255; + pgstyles.PgStyles[1].Items[5].Col = 255; + pgstyles.PgStyles[1].Items[6].Col = 255; + pgstyles.PgStyles[1].Items[7].Col = 251; + pgstyles.PgStyles[1].Items[8].Col = 242; + // General Text + pgstyles.PgStyles[2].Items[2].Col = 227; } private void AddCPBCK_Z00(ref PageStyles pgstyles) { SetRobinsonPageListFont(ref pgstyles); pgstyles.Name = "Duke Energy - Robinson Enhanced Background Foldout Page Styles"; + // Step Description Table + pgstyles.PgStyles[0].Items[7].Col = 276; + pgstyles.PgStyles[0].Items[8].Col = 525; } private void AddCPBCK_Z01(ref PageStyles pgstyles) { //SetRobinsonPageListFont(ref pgstyles); pgstyles.Name = "Duke Energy - Robinson Enhanced Background Status Tree Page Styles"; + // Step Description Table + pgstyles.PgStyles[0].Items[7].Col = 276; + pgstyles.PgStyles[0].Items[8].Col = 525; } private void AddCPBCK2(ref PageStyles pgstyles) { //SetRobinsonPageListFont(ref pgstyles); pgstyles.Name = "Duke Energy - Robinson Enhanced Backgrounds Additional Page Styles"; + // Additional Information Pages + pgstyles.PgStyles[0].Items[6].Col = 455; + pgstyles.PgStyles[0].Items[7].Col = 245; } private static void SetRobinsonPageListFont(ref PageStyles pgstyles) @@ -663,8 +691,11 @@ namespace fmtxml SetRobinsonDocStyleFont(ref dcstyles); dcstyles.DcStyles[0].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[0].UseCheckOffs = true; dcstyles.DcStyles[1].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[1].UseCheckOffs = true; dcstyles.DcStyles[2].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[2].UseCheckOffs = true; dcstyles.DcStyles[6].TopMargin = 91; dcstyles.DcStyles[6].PageWidth = 593; } @@ -673,8 +704,11 @@ namespace fmtxml SetRobinsonDocStyleFont(ref dcstyles); dcstyles.DcStyles[0].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[0].UseCheckOffs = true; dcstyles.DcStyles[1].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[1].UseCheckOffs = true; dcstyles.DcStyles[2].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[2].UseCheckOffs = true; dcstyles.DcStyles[6].TopMargin = 91; dcstyles.DcStyles[6].PageWidth = 593; } @@ -683,11 +717,21 @@ namespace fmtxml SetRobinsonDocStyleFont(ref dcstyles); dcstyles.DcStyles[0].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[0].UseCheckOffs = true; dcstyles.DcStyles[1].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[1].UseCheckOffs = true; dcstyles.DcStyles[2].ContTop = "%d. (CONTINUED)"; + dcstyles.DcStyles[2].UseCheckOffs = true; dcstyles.DcStyles[6].TopMargin = 91; dcstyles.DcStyles[6].PageWidth = 593; } + private void AddCPL_Y03(ref DocStyles dcstyles) + { + SetRobinsonDocStyleFont(ref dcstyles); + + dcstyles.Name = "Duke Energy - Robinson Robinson Duplex Foldout Doc Style"; + dcstyles.DcStyles[0].UseCheckOffs = true; + } private void AddCPLRDEV(ref DocStyles dcstyles) { dcstyles.Name = "Duke Energy - Robinson Deviation Format Document Styles"; @@ -702,6 +746,7 @@ namespace fmtxml { dcstyles.Name = "Duke Energy - Robinson Enhanced Background Styles"; //SetRobinsonDocStyleFont(ref dcstyles); + dcstyles.DcStyles[2].PageWidth = 585; } private void AddCPBCK_Y00(ref DocStyles dcstyles) { @@ -717,6 +762,7 @@ namespace fmtxml { dcstyles.Name = "Duke Energy - Robinson Enhanced Background Additional Styles"; //SetRobinsonDocStyleFont(ref dcstyles); + dcstyles.DcStyles[0].PageWidth = 570; } } public partial class RtfToSvg @@ -775,13 +821,13 @@ namespace fmtxml "" + "" + "" + - "STEP" + + "STEP" + "" + - "INSTRUCTIONS" + + "INSTRUCTIONS" + "" + "" + "" + - "RESPONSE{sp}NOT{sp}OBTAINED" + + "RESPONSE{sp}NOT{sp}OBTAINED" + "" + ""); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[1]); @@ -802,9 +848,9 @@ namespace fmtxml "" + "" + "" + - "EOP{sp}STEP" + - "ERG{sp}STEP" + - "DEVIATION/JUSTIFICATION" + + "EOP{sp}STEP" + + "ERG{sp}STEP" + + "DEVIATION / JUSTIFICATION" + ""); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[2]); }