From ddbfdcc0286338eeafcc786d92248f26cebaae74 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 Dec 2013 03:59:57 +0000 Subject: [PATCH] Format changes needed to correct format differences found during 16-bit comparisons. --- PROMS/fmtxml/PlantSpecific_Catawba.cs | 58 ++++++++++++++++++++++----- PROMS/fmtxml/PlantSpecific_McGuire.cs | 15 ++++++- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/PROMS/fmtxml/PlantSpecific_Catawba.cs b/PROMS/fmtxml/PlantSpecific_Catawba.cs index 215747f2..db7aee81 100644 --- a/PROMS/fmtxml/PlantSpecific_Catawba.cs +++ b/PROMS/fmtxml/PlantSpecific_Catawba.cs @@ -9,10 +9,17 @@ namespace fmtxml { private void AddCATfmt(ref FormatData fmtdata) // Catawba { - fmtdata.SectData.StepSectionData.StpSectLayData.Separator.SeparatorLocation = 2; + //fmtdata.SectData.StepSectionData.StpSectLayData.Separator.SeparatorLocation = 2; + fmtdata.ProcData.TitleLength = 45; + // 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,8 +28,10 @@ namespace fmtxml fmtdata.StepData[6].TabData.Bullet.Font.CPI = "12"; // note location/tab - fmtdata.StepData[7].StepLayoutData.STBoxindex = "1"; - fmtdata.StepData[7].TabData.Ident = "NOTE: "; + //fmtdata.StepData[7].StepLayoutData.STBoxindex = "1"; + fmtdata.StepData[7].TabData.Ident = "NOTE "; + fmtdata.StepData[7].TabData.IdentEdit = "NOTE "; + fmtdata.StepData[7].TabData.RNOIdent = "NOTE "; fmtdata.StepData[7].TabData.Bullet.Separate = "True"; fmtdata.StepData[7].TabData.Bullet.Font = new VE_Font(); fmtdata.StepData[7].TabData.Bullet.Font.FontFamily = "Arial"; @@ -33,14 +42,41 @@ 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 = " "; + //// 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 = " "; + //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"; + } + private void AddCATfmtOVR(ref FormatData fmtdata) // McGuire + { + // Transitions + fmtdata.TransData.TransTypeData[4].TransFormat = "{Sect Num} ({Sect Title}), Step {First Step}"; + fmtdata.TransData.TransTypeData[4].TransMenu = "{Sect Num} ({Sect Title}), Step {First Step}"; + fmtdata.TransData.TransTypeData[4].TransUI = "ProcCur, SectMenuAny, StepAllowNone, StepFirst"; } } public partial class FmtToXml diff --git a/PROMS/fmtxml/PlantSpecific_McGuire.cs b/PROMS/fmtxml/PlantSpecific_McGuire.cs index e094250d..484619c5 100644 --- a/PROMS/fmtxml/PlantSpecific_McGuire.cs +++ b/PROMS/fmtxml/PlantSpecific_McGuire.cs @@ -10,8 +10,10 @@ namespace fmtxml private void AddMCGfmt(ref FormatData fmtdata) // McGuire { //fmtdata.SectData.StepSectionData.StpSectLayData.Separator.SeparatorLocation = 2; - fmtdata.SectData.StepSectionData.StpSectLayData.ColT = 33; + fmtdata.SectData.StepSectionData.StpSectLayData.ColT = -3; + fmtdata.SectData.StepSectionData.StpSectLayData.WidT = 390; + fmtdata.ProcData.TitleLength = 45; // Base fmtdata.StepData[0].StepLayoutData.STExtraSpace = "0"; @@ -29,7 +31,9 @@ namespace fmtxml // note location/tab //fmtdata.StepData[7].StepLayoutData.STBoxindex = "1"; - fmtdata.StepData[7].TabData.Ident = "NOTE: "; + fmtdata.StepData[7].TabData.Ident = "NOTE "; + fmtdata.StepData[7].TabData.IdentEdit = "NOTE "; + fmtdata.StepData[7].TabData.RNOIdent = "NOTE "; fmtdata.StepData[7].TabData.Bullet.Separate = "True"; fmtdata.StepData[7].TabData.Bullet.Font = new VE_Font(); fmtdata.StepData[7].TabData.Bullet.Font.FontFamily = "Arial"; @@ -70,6 +74,13 @@ namespace fmtxml // Note 5 fmtdata.StepData[32].Inactive = "True"; } + private void AddMCGfmtOVR(ref FormatData fmtdata) // McGuire + { + // Transitions + fmtdata.TransData.TransTypeData[4].TransFormat = "{Sect Num} ({Sect Title}), Step {First Step}"; + fmtdata.TransData.TransTypeData[4].TransMenu = "{Sect Num} ({Sect Title}), Step {First Step}"; + fmtdata.TransData.TransTypeData[4].TransUI = "ProcCur, SectMenuAny, StepAllowNone, StepFirst"; + } } public partial class FmtToXml {