diff --git a/PROMS/fmtxml/FmtFileToXml.cs b/PROMS/fmtxml/FmtFileToXml.cs index 8e330f27..4d3dd9a4 100644 --- a/PROMS/fmtxml/FmtFileToXml.cs +++ b/PROMS/fmtxml/FmtFileToXml.cs @@ -524,6 +524,8 @@ public struct CheckOffData public string CheckOffOnHLSOnly; public string SkipSpaces; /* end of format flags */ + // for Byron and Braidwood + public string CheckoffOnSubStepsOnly; //public RightCheckOffBx [] RightCheckOffBoxList; public Absolute [] LayoutList; public CheckOffHeader[] CheckOffHeaderList; @@ -2494,6 +2496,7 @@ namespace fmtxml int DefaultCheckOffType = (rightCheckOffBox[2] > 0) ? rightCheckOffBox[2] : rightCheckOffBox[3] >> 8; fmtdata.ProcData.CheckOffData.AllowSectEdit = DefaultCheckOffType == 1 || (rightCheckOffBox[0] > 0 || rightCheckOffBox[1] > 0) ? "True" : "False"; fmtdata.ProcData.CheckOffData.AllowStepEdit = DefaultCheckOffType >= 1 ? "True" : "False"; + fmtdata.ProcData.CheckOffData.CheckoffOnSubStepsOnly = "False"; tmpshort = brFmt.ReadInt16(); // TwoCheckOffs fmtdata.ProcData.CheckOffData.CheckOffList = new CheckOff[MAXCHECKOFFS]; for (int i = 0; i < MAXCHECKOFFS; i++) fmtdata.ProcData.CheckOffData.CheckOffList[i].Index = i; @@ -4959,6 +4962,7 @@ namespace fmtxml if (mco.Menu == sco.Menu) subFmt.ProcData.CheckOffData.Menu = "null"; if (mco.AllowSectEdit == sco.AllowSectEdit) subFmt.ProcData.CheckOffData.AllowSectEdit = "null"; if (mco.AllowStepEdit == sco.AllowStepEdit) subFmt.ProcData.CheckOffData.AllowStepEdit = "null"; + if (mco.CheckoffOnSubStepsOnly == sco.CheckoffOnSubStepsOnly) subFmt.ProcData.CheckOffData.CheckoffOnSubStepsOnly = "null"; if (mco.UseCheckOffsIn == sco.UseCheckOffsIn) subFmt.ProcData.CheckOffData.UseCheckOffsIn = NullInt; if (mco.XLocation == sco.XLocation) subFmt.ProcData.CheckOffData.XLocation = NullInt; if (mco.CheckOffAdjustment == sco.CheckOffAdjustment) subFmt.ProcData.CheckOffData.CheckOffAdjustment = NullInt; diff --git a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs index e65cec25..329c0865 100644 --- a/PROMS/fmtxml/PlantSpecific_ByrBwd.cs +++ b/PROMS/fmtxml/PlantSpecific_ByrBwd.cs @@ -9,6 +9,9 @@ namespace fmtxml { private void AddCWEfmt(ref FormatData fmtdata) { + fmtdata.ProcData.CheckOffData.SkipSpaces = "True"; + fmtdata.ProcData.CheckOffData.CheckOffList[2].Macro = "C3"; + fmtdata.ProcData.CheckOffData.CheckoffOnSubStepsOnly = "True"; 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"; @@ -40,6 +43,9 @@ namespace fmtxml } private void AddEXCLNfmt(ref FormatData fmtdata) { + fmtdata.ProcData.CheckOffData.SkipSpaces = "True"; + fmtdata.ProcData.CheckOffData.CheckOffList[2].Macro = "C3"; + fmtdata.ProcData.CheckOffData.CheckoffOnSubStepsOnly = "True"; fmtdata.SectData.StepSectionData.StpSectLayData.WidSTablePrint = "475.2,229.2,144"; fmtdata.SectData.StepSectionData.StpSectLayData.ColRTable = "0,236.4,135.6"; fmtdata.SectData.ReplaceStrData[3].Flag = "RNO, Caution, Note, Table, Substep, Attach"; @@ -140,6 +146,11 @@ namespace fmtxml "" + ""); myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + + xdNew.LoadXml(" " + + "*" + + ""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); } private void AddEXCLN(XmlDocument myDoc) { @@ -151,6 +162,11 @@ namespace fmtxml "" + ""); myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); + + xdNew.LoadXml(" " + + "*" + + ""); + myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); } } } diff --git a/PROMS/fmtxml/TranslateFMT.XSL b/PROMS/fmtxml/TranslateFMT.XSL index ebb05b9c..7e64fed4 100644 Binary files a/PROMS/fmtxml/TranslateFMT.XSL and b/PROMS/fmtxml/TranslateFMT.XSL differ