From 7793bd23977b4129a2f0ecff36f409b12deaff38 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 17 Jan 2014 16:10:22 +0000 Subject: [PATCH] Specific changes to Byron/Braidwood fomat files Added default parameter to GetCombinedSlaveValue method and revised calls to method to utilize default parameter Added code to convert xF8 to degree symbol Revised CheckNoteCautionTab to handle when step format data calls for separate boxes for notes and cautions Added BoxLeftAdj property to support Braidwood boxed items --- .../Config/DocVersionConfig.cs | 14 ++++--- .../Config/ROFSTLookup.cs | 1 + .../VEPROMS.CSLA.Library/Extension/ItemExt.cs | 9 ++-- .../Format/PlantFormat.cs | 8 ++++ PROMS/fmtxml/PlantSpecific_ByrBwd.cs | 41 +++++++++++++++---- 5 files changed, 58 insertions(+), 15 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs index 279a9523..f24fa506 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs @@ -1017,7 +1017,7 @@ namespace VEPROMS.CSLA.Library { get { - string s = GetCombinedSlaveValue("ProcedureNumber") ?? _Xp["Unit", "ProcedureNumber"];// get the saved value + string s = GetCombinedSlaveValue("ProcedureNumber", null) ?? _Xp["Unit", "ProcedureNumber"];// get the saved value if (SelectedSlave > 0) s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "ProcedureNumber"]; return s; @@ -1039,7 +1039,7 @@ namespace VEPROMS.CSLA.Library { get { - string s = GetCombinedSlaveValue("SetName") ?? _Xp["ProcedureSet", "Name"];// get the saved value + string s = GetCombinedSlaveValue("SetName", null) ?? _Xp["ProcedureSet", "Name"];// get the saved value if (SelectedSlave > 0) s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "SetName"]; return s; @@ -1061,7 +1061,7 @@ namespace VEPROMS.CSLA.Library { get { - string s = GetCombinedSlaveValue("SetID") ?? _Xp["ProcedureSet", "ID"];// get the saved value + string s = GetCombinedSlaveValue("SetID", null) ?? _Xp["ProcedureSet", "ID"];// get the saved value if (SelectedSlave > 0) s = _Xp["Slave[@index='" + SelectedSlave.ToString() + "']", "SetID"]; return s; @@ -1640,7 +1640,7 @@ OnPropertyChanged("Default_BkColor"); } } //added by jcb to fix master issue byron/braidwood - private string GetCombinedSlaveValue(string item) + private string GetCombinedSlaveValue(string item, string defaultValue) { if (MaxSlaveIndex > 0) { @@ -1655,7 +1655,11 @@ OnPropertyChanged("Default_BkColor"); } return s; } - return null; + return defaultValue; + } + private string GetCombinedSlaveValue(string item) + { + return GetCombinedSlaveValue(item, "0"); } //end added by jcb to fix master issue byron/braidwood } diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index 233611c8..18c29764 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -206,6 +206,7 @@ namespace VEPROMS.CSLA.Library { string orig = s2; s2 = s2.Replace("`", @"\'b0"); // convert backquote to degree - left over from DOS days. + s2 = s2.Replace("\xf8", @"\'b0"); // convert \xf8 to degree. s2 = s2.Replace("\xa0", @"\u160?"); // hardspace s2 = s2.Replace("\xb0", @"\'b0"); // degree s2 = s2.Replace("\x7f", @"\u916?"); // delta diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 2994a2e5..123c9eba 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -3009,7 +3009,7 @@ namespace VEPROMS.CSLA.Library // use of the MixCautionsAndNotes format flag - no bullet is used, if more that one replace the tab // with a bullet. Also, if only one in group and tab text ends with 'S', remove it: bool mixCandN = MixCautionNotesDiffType(); - if ((MyPrevious == null && NextItem == null) || mixCandN) + if ((MyPrevious == null && NextItem == null) || mixCandN || FormatStepData.SeparateBox) { if (_MyHeader.CleanText.ToUpper().EndsWith("S")) { @@ -3039,8 +3039,11 @@ namespace VEPROMS.CSLA.Library _MyHeader = null; } } - tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB; - TabToIdentBAdjustFont(); + if (!this.FormatStepData.SeparateBox) + { + tbformat = ActiveFormat.PlantFormat.FormatData.SectData.StepSectionData.IdentB; + TabToIdentBAdjustFont(); + } } return tbformat; diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index 8e7a49c3..81e95af7 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -2703,6 +2703,14 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _RNOWidthAdj, "@RNOWidthAdj"); } } + private LazyLoad _BoxLeftAdj; + public string BoxLeftAdj + { + get + { + return LazyLoad(ref _BoxLeftAdj, "@BoxLeftAdj"); + } + } private LazyLoad _HLSWidthOVRD; public int? HLSWidthOVRD { diff --git a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs index 52509dfa..75f4bdd9 100644 --- a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs +++ b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs @@ -9,7 +9,7 @@ namespace fmtxml { private void AddCWEfmt(ref FormatData fmtdata) { - fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "475.2,229.2,144"; + fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "475.2,252.2,144"; fmtdata.SectData.ReplaceStrData[3].Flag = "RNO, Caution, Note, Table, Substep, Attach"; fmtdata.SectData.ReplaceStrData[4].Flag = "RNO, Caution, Note, Table, Substep, Attach"; fmtdata.StepData[9].TabData.Ident = " {!C2}{numeric} "; @@ -17,21 +17,26 @@ namespace fmtxml fmtdata.BoxData[2].TabPos = 265F; fmtdata.BoxData[2].Start = 128F; fmtdata.BoxData[2].End = 420F; - fmtdata.BoxData[2].TxtStart = 132F; - fmtdata.BoxData[2].TxtWidth = 276F; + fmtdata.BoxData[2].TxtStart = 151F; + fmtdata.BoxData[2].TxtWidth = 254F; fmtdata.BoxData[1].TabPos = 265F; fmtdata.BoxData[1].Start = 128F; fmtdata.BoxData[1].End = 420F; - fmtdata.BoxData[1].TxtStart = 132F; - fmtdata.BoxData[1].TxtWidth = 276F; + fmtdata.BoxData[1].TxtStart = 151F; + fmtdata.BoxData[1].TxtWidth = 254F; fmtdata.SectData.StepSectionData.StpSectLayData.RNOWidthAdj = "-13"; - //fmtdata.StepData[7]. + fmtdata.StepData[6].StepLayoutData.EveryNLines = "-99"; + fmtdata.StepData[7].StepLayoutData.EveryNLines = "-99"; + fmtdata.StepData[40].WidthOverride = "192"; } private void AddCWE00fmt(ref FormatData fmtdata) { fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "489,229.2,144"; fmtdata.StepData[2].TabData.Ident = "{ALPHA}. "; fmtdata.StepData[1].TabData.Ident = "{alpha}) "; + fmtdata.SectData.StepSectionData.StpSectLayData.BoxLeftAdj = "-43.2"; + fmtdata.StepData[6].StepLayoutData.EveryNLines = "-99"; + fmtdata.StepData[7].StepLayoutData.EveryNLines = "-99"; } private void AddEXCLNfmt(ref FormatData fmtdata) { @@ -54,6 +59,10 @@ namespace fmtxml fmtdata.StepData[2].TabData.Ident = "{ALPHA}. "; fmtdata.StepData[1].TabData.Ident = "{alpha}) "; } + private void AddEXCLN01fmt(ref FormatData fmtdata) + { + fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "489,229.2,144"; + } } public partial class FmtToXml { @@ -61,9 +70,27 @@ namespace fmtxml { pgstyles.PgStyles[0].Items[5].Col = 270F; } + private void AddEXCLN00fmt(ref PageStyles pgstyles) + { + pgstyles.PgStyles[0].Items[4].Col = 446F; + pgstyles.PgStyles[0].Items[4].Row = 30F; + pgstyles.PgStyles[0].Items[5].Col = 230F; + } + private void AddEXCLN00Doc(ref DocStyles dcstyles) + { + dcstyles.DcStyles[0].PageWidth = 576.2F; + dcstyles.DcStyles[0].PageLength = 600F; + dcstyles.DcStyles[0].FooterLen = 24F; + } private void AddCWEDoc(ref DocStyles dcstyles) { - //dcstyles.DcStyles[0].con + dcstyles.DcStyles[0].PageWidth = 580.2F; + dcstyles.DcStyles[1].LeftMargin = 43.2F; + dcstyles.DcStyles[1].PageWidth = 572.2F; + } + private void AddEXEDEVDoc(ref DocStyles dcstyles) + { + dcstyles.DcStyles[0].LeftMargin = 99F; } } public partial class RtfToSvg