diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs index 2bdc93ac..afcce261 100644 --- a/PROMS/Volian.Print.Library/vlnParagraph.cs +++ b/PROMS/Volian.Print.Library/vlnParagraph.cs @@ -1097,8 +1097,10 @@ namespace Volian.Print.Library if (myMsg.Contains("{Section Number}")) myMsg = myMsg.Replace("{Section Number}", MyItemInfo.ActiveSection.DisplayNumber); //jcb code - if (myMsg.Contains("%-8s")) - myMsg = myMsg.Replace("%-8s", MyItemInfo.MyProcedure.DisplayNumber.PadRight(8)); + //if (myMsg.Contains("%-8s")) + // myMsg = myMsg.Replace("%-8s", MyItemInfo.MyProcedure.DisplayNumber.PadRight(8)); + if (myMsg.Contains("%-12s")) + myMsg = myMsg.Replace("%-12s", MyItemInfo.MyProcedure.DisplayNumber.PadRight(12)); //end jb code // center the message. float wtpm = (float)docstyle.Layout.PageWidth - (float)docstyle.Layout.LeftMargin; diff --git a/PROMS/Volian.Print.Library/vlnTab.cs b/PROMS/Volian.Print.Library/vlnTab.cs index f10f9e1b..8390bced 100644 --- a/PROMS/Volian.Print.Library/vlnTab.cs +++ b/PROMS/Volian.Print.Library/vlnTab.cs @@ -228,7 +228,10 @@ namespace Volian.Print.Library } } } - Rtf = GetRtf(origTab, vFont); + if (SeparateBullet) + Rtf = GetRtf(origTab, myparent.MyItemInfo.FormatStepData.TabData.Bullet.Font); + else + Rtf = GetRtf(origTab, vFont); Rtf = Rtf.Replace("\u0394", @"\f1\u916?\f0 "); // delta 0x0394 if (ScriptCaution) { diff --git a/PROMS/fmtxml/PlantSpecific_Robinson.cs b/PROMS/fmtxml/PlantSpecific_Robinson.cs index a470629e..bf265976 100644 --- a/PROMS/fmtxml/PlantSpecific_Robinson.cs +++ b/PROMS/fmtxml/PlantSpecific_Robinson.cs @@ -17,8 +17,20 @@ namespace fmtxml fmtdata.BoxData[1].End = 457; // caution box // Caution fmtdata.StepData[6].MixCautionsAndNotes = "True"; + fmtdata.StepData[6].TabData.Bullet.Separate = "True"; + fmtdata.StepData[6].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[6].TabData.Bullet.Font.FontFamily = "Arial"; + fmtdata.StepData[6].TabData.Bullet.Font.FontSize = "12"; + fmtdata.StepData[6].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[6].TabData.Bullet.Font.CPI = "12"; // Note fmtdata.StepData[7].MixCautionsAndNotes = "True"; + fmtdata.StepData[7].TabData.Bullet.Separate = "True"; + fmtdata.StepData[7].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[7].TabData.Bullet.Font.FontFamily = "Arial"; + fmtdata.StepData[7].TabData.Bullet.Font.FontSize = "12"; + fmtdata.StepData[7].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[7].TabData.Bullet.Font.CPI = "12"; // Unnumber High level Step fmtdata.StepData[18].BoxIt = "False"; fmtdata.StepData[18].StepEditData.TypeMenu.MenuItem = "Unnumbered Step"; @@ -183,6 +195,22 @@ namespace fmtxml { Robinson_ArialFontInProcedures(ref fmtdata); fmtdata.Name = "Duke Energy - Robinson AOP Format"; + // Caution + fmtdata.StepData[6].MixCautionsAndNotes = "True"; + fmtdata.StepData[6].TabData.Bullet.Separate = "True"; + fmtdata.StepData[6].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[6].TabData.Bullet.Font.FontFamily = "Arial"; + fmtdata.StepData[6].TabData.Bullet.Font.FontSize = "12"; + fmtdata.StepData[6].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[6].TabData.Bullet.Font.CPI = "12"; + // Note + fmtdata.StepData[7].MixCautionsAndNotes = "True"; + fmtdata.StepData[7].TabData.Bullet.Separate = "True"; + fmtdata.StepData[7].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[7].TabData.Bullet.Font.FontFamily = "Arial"; + fmtdata.StepData[7].TabData.Bullet.Font.FontSize = "12"; + fmtdata.StepData[7].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[7].TabData.Bullet.Font.CPI = "12"; } private void AddCPBCK(ref FormatData fmtdata) // Robinson { diff --git a/PROMS/fmtxml/PlantSpecific_Summer.cs b/PROMS/fmtxml/PlantSpecific_Summer.cs index 5b135bc3..f8c0a9ea 100644 --- a/PROMS/fmtxml/PlantSpecific_Summer.cs +++ b/PROMS/fmtxml/PlantSpecific_Summer.cs @@ -25,9 +25,96 @@ namespace fmtxml fmtdata.StepData[3].TabData.RNOIdent = " {numeric}"; fmtdata.StepData[3].TabData.RNOExcludeMacros = true; fmtdata.StepData[3].TabData.MacroTabAdjust = -6; + // Caution + fmtdata.StepData[6].TabData.Bullet.Separate = "True"; + fmtdata.StepData[6].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[6].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[6].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[6].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[6].TabData.Bullet.Font.CPI = "12.5"; + // Note + fmtdata.StepData[7].TabData.Bullet.Separate = "True"; + fmtdata.StepData[7].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[7].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[7].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[7].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[7].TabData.Bullet.Font.CPI = "12.5"; + fmtdata.StepData[8].StepLayoutData.STBoxindex = null; + // Caution 1 + fmtdata.StepData[20].TabData.Bullet.Separate = "True"; + fmtdata.StepData[20].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[20].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[20].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[20].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[20].TabData.Bullet.Font.CPI = "12.5"; + + // Caution 2 fmtdata.StepData[21].TabData.IsTransition = true; + fmtdata.StepData[21].TabData.Bullet.Separate = "True"; + fmtdata.StepData[21].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[21].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[21].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[21].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[21].TabData.Bullet.Font.CPI = "12.5"; + + // Note 1 + fmtdata.StepData[22].TabData.Bullet.Separate = "True"; + fmtdata.StepData[22].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[22].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[22].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[22].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[22].TabData.Bullet.Font.CPI = "12.5"; + + // Note 2 fmtdata.StepData[23].TabData.IsTransition = true; + fmtdata.StepData[23].TabData.Bullet.Separate = "True"; + fmtdata.StepData[23].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[23].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[23].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[23].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[23].TabData.Bullet.Font.CPI = "12.5"; + + // Note 3 + fmtdata.StepData[26].TabData.Bullet.Separate = "True"; + fmtdata.StepData[26].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[26].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[26].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[26].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[26].TabData.Bullet.Font.CPI = "12.5"; + + // Caution 3 + fmtdata.StepData[27].TabData.Bullet.Separate = "True"; + fmtdata.StepData[27].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[27].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[27].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[27].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[27].TabData.Bullet.Font.CPI = "12.5"; + + // Note 4 + fmtdata.StepData[28].TabData.Bullet.Separate = "True"; + fmtdata.StepData[28].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[28].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[28].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[28].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[28].TabData.Bullet.Font.CPI = "12.5"; + + // Caution 4 + fmtdata.StepData[29].TabData.Bullet.Separate = "True"; + fmtdata.StepData[29].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[29].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[29].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[29].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[29].TabData.Bullet.Font.CPI = "12.5"; + + // Note 5 + fmtdata.StepData[32].TabData.Bullet.Separate = "True"; + fmtdata.StepData[32].TabData.Bullet.Font = new VE_Font(); + fmtdata.StepData[32].TabData.Bullet.Font.FontFamily = "Letter Gothic Tall"; + fmtdata.StepData[32].TabData.Bullet.Font.FontSize = "10"; + fmtdata.StepData[32].TabData.Bullet.Font.FontStyle = "none"; + fmtdata.StepData[32].TabData.Bullet.Font.CPI = "12.5"; + fmtdata.StepData[3].StepLayoutData.STExtraSpace = "-12345"; //this will put in a null fmtdata.StepData[9].StepLayoutData.STExtraSpace = "-12345"; //this will put in a null fmtdata.StepData[18].StepLayoutData.STExtraSpace = "-12345"; //this will put in a null @@ -144,15 +231,17 @@ namespace fmtxml private void AddSUMDOC(ref DocStyles dcstyles) { dcstyles.DcStyles[0].CenterLineX = 261.9F; - dcstyles.DcStyles[0].CenterLineYTop = 642.2F; + dcstyles.DcStyles[0].CenterLineYTop = 652.2F; //dcstyles.DcStyles[0].CenterLineYBottom = 49.2F; dcstyles.DcStyles[0].CenterLineYBottom = 40.2F; - dcstyles.DcStyles[0].EndString = " - - - - - - - - - - - - - - - - \n - - - - - - - - - - - - - - | End of %-8s | - - - - - - - - - - - - \n - - - - - - - - - - - - - - - -"; + //dcstyles.DcStyles[0].EndString = " - - - - - - - - - - - - - - - - \n - - - - - - - - - - - - - - | End of %-8s | - - - - - - - - - - - - \n - - - - - - - - - - - - - - - -"; + dcstyles.DcStyles[0].EndString = " - - - - - - - - - - - - - - - - \n - - - - - - - - - - - - - - | End of %-12s | - - - - - - - - - - - - \n - - - - - - - - - - - - - - - -"; dcstyles.DcStyles[1].CenterLineX = 261.9F; dcstyles.DcStyles[1].CenterLineYTop = 678.2F; //dcstyles.DcStyles[1].CenterLineYBottom = 49.2F; dcstyles.DcStyles[1].CenterLineYBottom = 40.2F; - dcstyles.DcStyles[1].EndString = " - - - - - - - - - - - - - - - - \n - - - - - - - - - - - - - - | End of %-8s | - - - - - - - - - - - - \n - - - - - - - - - - - - - - - -"; + //dcstyles.DcStyles[1].EndString = " - - - - - - - - - - - - - - - - \n - - - - - - - - - - - - - - | End of %-8s | - - - - - - - - - - - - \n - - - - - - - - - - - - - - - -"; + dcstyles.DcStyles[1].EndString = " - - - - - - - - - - - - - - - - \n - - - - - - - - - - - - - - | End of %-12s | - - - - - - - - - - - - \n - - - - - - - - - - - - - - - -"; dcstyles.DcStyles[2].CenterLineX = 261.9F; dcstyles.DcStyles[2].CenterLineYTop = 678.2F; //dcstyles.DcStyles[2].CenterLineYBottom = 49.2F; @@ -205,7 +294,7 @@ namespace fmtxml dcstyles.DcStyles[13].dstyle.FontSize = "10"; dcstyles.DcStyles[13].dstyle.FontStyle = "None"; dcstyles.DcStyles[13].dstyle.CPI = "12.5"; - //jsj Attachment Steps- Two Column + //jsj Attachment Steps- one Column dcstyles.DcStyles[14].Name = "Attachment Steps- One Column"; dcstyles.DcStyles[14].Index = 14; dcstyles.DcStyles[14].pagestyle = 5;