From c30e434d151e6ecbc8b4d091e2f6c85eb574518c Mon Sep 17 00:00:00 2001 From: Kathy Date: Tue, 25 Mar 2014 12:04:46 +0000 Subject: [PATCH] added BGE methods uncomment/use NumberWithLevel format flag --- PROMS/fmtxml/AppendPlantSpecific.cs | 6 ++++++ PROMS/fmtxml/FmtFileToXml.cs | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index f11e736e..c731eff6 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -232,6 +232,9 @@ namespace fmtxml case "WEPENB.FMT": AddWEPENBFmt(ref fmtdata); break; + case "BGEEOP.FMT": + AddBGEEOPfmt(ref fmtdata); + break; } } @@ -1330,6 +1333,9 @@ namespace fmtxml case "WEPENB.DOC": AddWEPENBDOC(ref dcstyles); break; + case "BGEEOP.DOC": + AddBGEEOPDOC(ref dcstyles); + break; } } private void AddWCNBCKDoc(ref DocStyles dcstyles) diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 9764c471..c70d651c 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -261,7 +261,7 @@ public struct XtraFlgs public string SecTitleContinue; // from xtra_flag array 11 public string CancelSecTitlesOnE0; public string MetaSectEndMessage; - // public string RNONUMBERWITHLEVEL // not migrated: used in bgeeop + public string RNONumberWithLevel; // not migrated: used in bgeeop // public string FORCELETTEREDHLS // not migrated: used in bgestp // public string CANCELSECTITLESONE1 // not migrated: used in bgeoid public string CancelSecTitlesOnE2; @@ -942,6 +942,7 @@ public struct Step //end for Comanche Peak by jcb public string MixCautionsAndNotes; public string NumberHighLevel; // NumberHighLevelRNO + public string NumberWithLevel; // RNONumberWithLevel; public string OffsetTab; public string AdjHighLevelTab; // Added for FNP - high level RNO public string ChildIndent; // Added for Callaway Backgrounds @@ -1344,6 +1345,7 @@ namespace fmtxml public static int SECTITLECONTINUE = 0x0001; public static int CANCELSECTITLESONE0 = 0x0002; public static int METASECTENDMESSAGE = 0x0004; + public static int RNONUMBERWITHLEVEL = 0x0008; public static int CANCELSECTITLESONE2 = 0x0040; public static int COMPRESSHPSUPER = 0x2000; @@ -2068,6 +2070,7 @@ namespace fmtxml if ((flg & SECTITLECONTINUE) > 0) XtraFlags.SecTitleContinue = true.ToString(); if ((flg & CANCELSECTITLESONE0) > 0) XtraFlags.CancelSecTitlesOnE0 = true.ToString(); if ((flg & METASECTENDMESSAGE) > 0) XtraFlags.MetaSectEndMessage = true.ToString(); + if ((flg & RNONUMBERWITHLEVEL) > 0) XtraFlags.RNONumberWithLevel = true.ToString(); if ((flg & CANCELSECTITLESONE2) > 0) XtraFlags.CancelSecTitlesOnE2 = true.ToString(); if ((flg & COMPRESSHPSUPER) > 0) XtraFlags.CompressHPSuper = true.ToString(); } @@ -3835,6 +3838,9 @@ namespace fmtxml if (XtraFlags.NumberHighLevelRNO == "True") fmtdata.StepData[i].NumberHighLevel = "True"; else fmtdata.StepData[i].NumberHighLevel = "False"; + if (XtraFlags.RNONumberWithLevel == "True") fmtdata.StepData[i].NumberWithLevel = "True"; + else fmtdata.StepData[i].NumberWithLevel = "False"; + if (XtraFlags.DontOffsetTab == "True") fmtdata.StepData[i].OffsetTab = "False"; else fmtdata.StepData[i].OffsetTab = "True"; @@ -5396,6 +5402,7 @@ namespace fmtxml private string StepPartAlwaysTab(Step stp) { return stp.AlwaysTab; } private string StepPartMixCautionsAndNotes(Step stp) { return stp.MixCautionsAndNotes; } private string StepPartNumberHighLevel(Step stp) { return stp.NumberHighLevel; } + private string StepPartNumberWithLevel(Step stp) { return stp.NumberWithLevel; } private string StepPartOffsetTab(Step stp) { return stp.OffsetTab; } private string StepPartAdjHighLevelTab(Step stp) { return stp.AdjHighLevelTab; } private string StepPartChildIndent(Step stp) { return stp.ChildIndent; } @@ -5648,6 +5655,7 @@ namespace fmtxml if (CheckInheritedStr(new StepPartStr(StepPartAlwaysTab), step, dicParents)) step.AlwaysTab = null; if (CheckInheritedStr(new StepPartStr(StepPartMixCautionsAndNotes), step, dicParents)) step.MixCautionsAndNotes = null; if (CheckInheritedStr(new StepPartStr(StepPartNumberHighLevel), step, dicParents)) step.NumberHighLevel = null; + if (CheckInheritedStr(new StepPartStr(StepPartNumberWithLevel), step, dicParents)) step.NumberWithLevel = 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;