diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index ab612fca..5776f89b 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -255,7 +255,7 @@ public struct XtraFlgs // public string DONTAUTOENDFORMATTING // not migrated: used in various bge // public string REMOVEBASISFROMTRANS // not migrated: used in various bge public string PutOnPageByItself; - // public string USEPHONELIST // not migrated: used in bge + public string PrintPhoneList; // used in bge AOP data (UsePhoneList in 16-bit) #endregion #region xtraflags11 public string SecTitleContinue; // from xtra_flag array 11 @@ -622,6 +622,7 @@ public struct Section public string SecTitleContinue; public string ConvertCaretToDelta; public string TurnOffReplaceWords; + public string PrintPhoneList; /* end of Format flags */ public SectionNum SectionNumber; public SectionHead SectionHeader; @@ -691,6 +692,7 @@ public struct AccSection { public int AutoContActSumSection; public TOC TableOfContentsData; + public PlaceKeeper PlaceKeeperData; } [Serializable] public struct TOC @@ -704,6 +706,22 @@ public struct TOC public VE_Font Font; } [Serializable] +public struct PlaceKeeper +{ + public string PKTopContinueMessage; + public string PKBottomNote; + public VE_Font Font; + public PKColumn[] PKColumns; +} +[Serializable] +public struct PKColumn +{ + public float PKColPos; + public float PKColWidth; + public string PKColHeaderText; + public VE_Font PKColHeaderFont; +} +[Serializable] public struct MetaSection { public int Index; // do I need this to order them or will SecNumPositionAdj work? @@ -1348,6 +1366,7 @@ namespace fmtxml public static int NOTESTOFOOTNOTES = 0x0400; public static int UNDSPECIALSTEPSFOLDOUT = 0x0800; public static int PUTONPAGEBYITSELF = 0x4000; + public static int PRINTPHONELIST = 0x8000; // USEPHONELIST in 16-bit code // XtraFlag[11] from 16-bit... @@ -2073,6 +2092,7 @@ namespace fmtxml if ((flg & NOTESTOFOOTNOTES) > 0) XtraFlags.NotesToFootnotes = true.ToString(); if ((flg & UNDSPECIALSTEPSFOLDOUT) > 0) XtraFlags.UndSpecialStepsFoldout = true.ToString(); if ((flg & PUTONPAGEBYITSELF) > 0) XtraFlags.PutOnPageByItself = true.ToString(); + if ((flg & PRINTPHONELIST) > 0) XtraFlags.PrintPhoneList = true.ToString(); } else if (i == 11) { @@ -4086,6 +4106,8 @@ namespace fmtxml else fmtdata.SectData.SecTitleContinue = "False"; if (XtraFlags.DontConvertCaretToDelta == "True") fmtdata.SectData.ConvertCaretToDelta = "False"; else fmtdata.SectData.ConvertCaretToDelta = "True"; + if (XtraFlags.PrintPhoneList == "True") fmtdata.SectData.PrintPhoneList = "True"; + else fmtdata.SectData.PrintPhoneList = "False"; #endregion #region StepSectionPrint if (XtraFlags.LowerCaseRevnum == "True") fmtdata.SectData.StepSectionData.StpSectPrtData.LowerCaseRevNum = "True"; @@ -5071,6 +5093,7 @@ namespace fmtxml if (mainFmt.SectData.SecTitleContinue != null && mainFmt.SectData.SecTitleContinue == subFmt.SectData.SecTitleContinue) subFmt.SectData.SecTitleContinue = "null"; if (mainFmt.SectData.ConvertCaretToDelta != null && mainFmt.SectData.ConvertCaretToDelta == subFmt.SectData.ConvertCaretToDelta) subFmt.SectData.ConvertCaretToDelta = "null"; if (mainFmt.SectData.TurnOffReplaceWords != null && mainFmt.SectData.TurnOffReplaceWords == subFmt.SectData.TurnOffReplaceWords) subFmt.SectData.TurnOffReplaceWords = "null"; + if (mainFmt.SectData.PrintPhoneList != null && mainFmt.SectData.PrintPhoneList == subFmt.SectData.PrintPhoneList) subFmt.SectData.PrintPhoneList = "null"; if (msctlay.SubPaginationWght == ssctlay.SubPaginationWght) subFmt.SectData.StepSectionData.StpSectLayData.SubPaginationWght = NullInt; if (msctlay.TextTitleAdjustment == ssctlay.TextTitleAdjustment) subFmt.SectData.StepSectionData.StpSectLayData.TextTitleAdjustment = NullInt; diff --git a/PROMS/fmtxml/PlantSpecific_Calvert.cs b/PROMS/fmtxml/PlantSpecific_Calvert.cs index bf493cbe..7dd48bec 100644 --- a/PROMS/fmtxml/PlantSpecific_Calvert.cs +++ b/PROMS/fmtxml/PlantSpecific_Calvert.cs @@ -29,6 +29,48 @@ namespace fmtxml fmtdata.TransData.TransTypeData[0].TransUI = "ProcMenu, SectDefault, StepAllowNone, StepFirst"; fmtdata.TransData.TransTypeData[4].TransUI = "ProcCur, SectMenuAny, StepAllowNone, StepFirst"; fmtdata.TransData.TransTypeData[5].TransUI = "ProcMenu, SectMenuAny, StepAllowNone, StepFirst"; + + //Placekeeper settings + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKBottomNote = "NOTE: Continuously Applicable Steps are designated with a \"C\" in the Done column."; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKTopContinueMessage = "(continued)"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.Font = new VE_Font(); + fmtdata.SectData.AccSectionData.PlaceKeeperData.Font.FontFamily = "Arial"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.Font.FontSize = "11"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.Font.FontStyle = "None"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.Font.CPI = "12"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns = new PKColumn[4]; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[0].PKColHeaderText = "START"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[0].PKColPos = 0; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[0].PKColWidth = 100; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[0].PKColHeaderFont = new VE_Font(); + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[0].PKColHeaderFont.FontFamily = "Arial"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[0].PKColHeaderFont.FontSize = "11"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[0].PKColHeaderFont.FontStyle = "Bold"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[0].PKColHeaderFont.CPI = "12"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[1].PKColHeaderText = "FUNCTION"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[1].PKColPos = 0; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[1].PKColWidth = 500; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[1].PKColHeaderFont = new VE_Font(); + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[1].PKColHeaderFont.FontFamily = "Arial"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[1].PKColHeaderFont.FontSize = "11"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[1].PKColHeaderFont.FontStyle = "Bold"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[1].PKColHeaderFont.CPI = "12"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[2].PKColHeaderText = "DONE"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[2].PKColPos = 0; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[2].PKColWidth = 100; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[2].PKColHeaderFont = new VE_Font(); + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[2].PKColHeaderFont.FontFamily = "Arial"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[2].PKColHeaderFont.FontSize = "11"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[2].PKColHeaderFont.FontStyle = "Bold"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[2].PKColHeaderFont.CPI = "12"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[3].PKColHeaderText = "PAGE"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[3].PKColPos = 0; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[3].PKColWidth = 100; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[3].PKColHeaderFont = new VE_Font(); + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[3].PKColHeaderFont.FontFamily = "Arial"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[3].PKColHeaderFont.FontSize = "11"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[3].PKColHeaderFont.FontStyle = "Bold"; + fmtdata.SectData.AccSectionData.PlaceKeeperData.PKColumns[3].PKColHeaderFont.CPI = "12"; } } public partial class FmtToXml diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 7c41e7e6..5d3f550a 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ