diff --git a/PROMS/Formats/fmtall/GinnaFSGbckall.xml b/PROMS/Formats/fmtall/GinnaFSGbckall.xml index 31cf9dfa..a23e40fb 100644 Binary files a/PROMS/Formats/fmtall/GinnaFSGbckall.xml and b/PROMS/Formats/fmtall/GinnaFSGbckall.xml differ diff --git a/PROMS/Formats/fmtall/RGEBCKall.xml b/PROMS/Formats/fmtall/RGEBCKall.xml index b40727b8..519d4f66 100644 Binary files a/PROMS/Formats/fmtall/RGEBCKall.xml and b/PROMS/Formats/fmtall/RGEBCKall.xml differ diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs index 73801305..816de0d8 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs @@ -222,6 +222,15 @@ namespace VEPROMS.CSLA.Library return null; } } + public FormatInfo DefaultFormat + { + get + { + if (_Procedure != null && _Procedure.MyProcedureInfo.ActiveParent != null && _Procedure.MyProcedureInfo.ActiveParent.ActiveFormat != null) return FormatInfo.Get(_Procedure.MyProcedureInfo.ActiveParent.ActiveFormat.FormatID); + if (_ProcedureInfo != null && _ProcedureInfo.MyParent != null && _ProcedureInfo.MyParent.ActiveFormat != null) return _ProcedureInfo.MyParent.ActiveFormat; + return null; + } + } public Procedure MyProcedure { get { return _Procedure; } } #endregion @@ -262,7 +271,11 @@ namespace VEPROMS.CSLA.Library s = _Xp.ParentValue("Format", "Columns"); // get the parent value // If there is no parent value, then use the volian default if (s == string.Empty || s == "t") // fnp aop1 had this (not sure about other fnp data) - return FormatColumns.TwoColumn;// At the procedure level, default to Two column + { + if (DefaultFormat != null) + return (FormatColumns) (DefaultFormat.PlantFormat.FormatData.SectData.StepSectionData.StepSectionLayoutData.ColumnMode?? + (int)FormatColumns.TwoColumn);// At the procedure level, default to Two column + } return (FormatColumns)int.Parse(s); } diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index ea7a9f67..614ae29c 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -2935,6 +2935,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _PMode, "@PMode"); } } + private LazyLoad _ColumnMode; + public int? ColumnMode + { + get + { + return LazyLoad(ref _ColumnMode, "@ColumnMode"); + } + } private LazyLoad _MaxRNO; public int? MaxRNO {