diff --git a/PROMS/fmtxml/AppendPlantSpecific.cs b/PROMS/fmtxml/AppendPlantSpecific.cs index c31f2d9c..7b3acaba 100644 --- a/PROMS/fmtxml/AppendPlantSpecific.cs +++ b/PROMS/fmtxml/AppendPlantSpecific.cs @@ -131,6 +131,7 @@ namespace fmtxml fmtdata.BoxData[1].End = 500; fmtdata.BoxData[2].Start = -15; fmtdata.BoxData[2].End = 505; + fmtdata.StepData[40].AdjHighLevelTab = "-24"; } private void AddCAL2fmt(ref FormatData fmtdata) diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index a2c0cb3e..92d9dc61 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -732,6 +732,7 @@ public struct StepSectionLayout public float SingleColumnRNOIndent; public bool RNOWidthSameAsHighParent; //end for VCSummer by jcb + /* Format flags moved to here.... */ public string Dev_Format; public string EnhancedShortFormDev; @@ -925,6 +926,7 @@ public struct Step public string MixCautionsAndNotes; public string NumberHighLevel; // NumberHighLevelRNO public string OffsetTab; + public string AdjHighLevelTab; // Added for FNP - high level RNO public string LeftJustifyBorderless; // LJBorderlessTable public string StepNumIfOnlyOne; // NoStepNumIfOnlyOneStep public string LJTabs; @@ -5312,6 +5314,7 @@ namespace fmtxml private string StepPartMixCautionsAndNotes(Step stp) { return stp.MixCautionsAndNotes; } private string StepPartNumberHighLevel(Step stp) { return stp.NumberHighLevel; } private string StepPartOffsetTab(Step stp) { return stp.OffsetTab; } + private string StepPartAdjHighLevelTab(Step stp) { return stp.AdjHighLevelTab; } private string StepPartLeftJustifyBorderless(Step stp) { return stp.LeftJustifyBorderless; } private string StepPartStepNumIfOnlyOne(Step stp) { return stp.StepNumIfOnlyOne; } private string StepPartLJTabs(Step stp) { return stp.LJTabs; } @@ -5551,6 +5554,7 @@ namespace fmtxml if (CheckInheritedStr(new StepPartStr(StepPartMixCautionsAndNotes), step, dicParents)) step.MixCautionsAndNotes = null; if (CheckInheritedStr(new StepPartStr(StepPartNumberHighLevel), step, dicParents)) step.NumberHighLevel = 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(StepPartLeftJustifyBorderless), step, dicParents)) step.LeftJustifyBorderless = null; if (CheckInheritedStr(new StepPartStr(StepPartStepNumIfOnlyOne), step, dicParents)) step.StepNumIfOnlyOne = null; if (CheckInheritedStr(new StepPartStr(StepPartLJTabs), step, dicParents)) step.LJTabs = null; diff --git a/PROMS/fmtxml/FmtToXml.cs b/PROMS/fmtxml/FmtToXml.cs index 05912a63..cb2d2ba4 100644 --- a/PROMS/fmtxml/FmtToXml.cs +++ b/PROMS/fmtxml/FmtToXml.cs @@ -236,7 +236,7 @@ public enum E_TabCheckOff : uint public enum E_OldToNewSteps : uint { - S0 = 1, S1 = 2, S2 = 4, E0 = 1048576, E1 = 2097152, E2 = 4194304, X0 = 67108864, X1 = 134217728, X2 = 268435456 + S0 = 1, S1 = 2, S2 = 4, E0 = 1048576, E1 = 2097152, E2 = 4194304, X0 = 33554432, X1 = 67108864, X2 = 134217728 }; #endregion #region TypeConverters @@ -506,7 +506,7 @@ namespace fmtxml { MyPath = path; fmtName = nm; - //if (!fmtName.ToUpper().StartsWith("RGESAM1") && fmtName.ToUpper() != "BASE") return; + //if (!fmtName.ToUpper().StartsWith("FNP") && fmtName.ToUpper() != "BASE") return; try { // get the default base & plant files to use when figuring out inheritance. diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index 66ee45cd..0a4425b1 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ