Added format flag CheckoffOnSubStepsOnly for Bryon and Braidwood

Fixed the Signoff style of checkoffs
This commit is contained in:
John Jenko 2014-02-24 16:34:57 +00:00
parent 6bcbe25d4e
commit afdf8a280e
3 changed files with 20 additions and 0 deletions

View File

@ -524,6 +524,8 @@ public struct CheckOffData
public string CheckOffOnHLSOnly; public string CheckOffOnHLSOnly;
public string SkipSpaces; public string SkipSpaces;
/* end of format flags */ /* end of format flags */
// for Byron and Braidwood
public string CheckoffOnSubStepsOnly;
//public RightCheckOffBx [] RightCheckOffBoxList; //public RightCheckOffBx [] RightCheckOffBoxList;
public Absolute [] LayoutList; public Absolute [] LayoutList;
public CheckOffHeader[] CheckOffHeaderList; public CheckOffHeader[] CheckOffHeaderList;
@ -2494,6 +2496,7 @@ namespace fmtxml
int DefaultCheckOffType = (rightCheckOffBox[2] > 0) ? rightCheckOffBox[2] : rightCheckOffBox[3] >> 8; 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.AllowSectEdit = DefaultCheckOffType == 1 || (rightCheckOffBox[0] > 0 || rightCheckOffBox[1] > 0) ? "True" : "False";
fmtdata.ProcData.CheckOffData.AllowStepEdit = DefaultCheckOffType >= 1 ? "True" : "False"; fmtdata.ProcData.CheckOffData.AllowStepEdit = DefaultCheckOffType >= 1 ? "True" : "False";
fmtdata.ProcData.CheckOffData.CheckoffOnSubStepsOnly = "False";
tmpshort = brFmt.ReadInt16(); // TwoCheckOffs tmpshort = brFmt.ReadInt16(); // TwoCheckOffs
fmtdata.ProcData.CheckOffData.CheckOffList = new CheckOff[MAXCHECKOFFS]; fmtdata.ProcData.CheckOffData.CheckOffList = new CheckOff[MAXCHECKOFFS];
for (int i = 0; i < MAXCHECKOFFS; i++) fmtdata.ProcData.CheckOffData.CheckOffList[i].Index = i; 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.Menu == sco.Menu) subFmt.ProcData.CheckOffData.Menu = "null";
if (mco.AllowSectEdit == sco.AllowSectEdit) subFmt.ProcData.CheckOffData.AllowSectEdit = "null"; if (mco.AllowSectEdit == sco.AllowSectEdit) subFmt.ProcData.CheckOffData.AllowSectEdit = "null";
if (mco.AllowStepEdit == sco.AllowStepEdit) subFmt.ProcData.CheckOffData.AllowStepEdit = "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.UseCheckOffsIn == sco.UseCheckOffsIn) subFmt.ProcData.CheckOffData.UseCheckOffsIn = NullInt;
if (mco.XLocation == sco.XLocation) subFmt.ProcData.CheckOffData.XLocation = NullInt; if (mco.XLocation == sco.XLocation) subFmt.ProcData.CheckOffData.XLocation = NullInt;
if (mco.CheckOffAdjustment == sco.CheckOffAdjustment) subFmt.ProcData.CheckOffData.CheckOffAdjustment = NullInt; if (mco.CheckOffAdjustment == sco.CheckOffAdjustment) subFmt.ProcData.CheckOffData.CheckOffAdjustment = NullInt;

View File

@ -9,6 +9,9 @@ namespace fmtxml
{ {
private void AddCWEfmt(ref FormatData fmtdata) 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.StepSectionData.StpSectLayData.WidSTablePrint = "475.2,252.2,144";
fmtdata.SectData.ReplaceStrData[3].Flag = "RNO, Caution, Note, Table, Substep, Attach"; fmtdata.SectData.ReplaceStrData[3].Flag = "RNO, Caution, Note, Table, Substep, Attach";
fmtdata.SectData.ReplaceStrData[4].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) 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.WidSTablePrint = "475.2,229.2,144";
fmtdata.SectData.StepSectionData.StpSectLayData.ColRTable = "0,236.4,135.6"; fmtdata.SectData.StepSectionData.StpSectLayData.ColRTable = "0,236.4,135.6";
fmtdata.SectData.ReplaceStrData[3].Flag = "RNO, Caution, Note, Table, Substep, Attach"; fmtdata.SectData.ReplaceStrData[3].Flag = "RNO, Caution, Note, Table, Substep, Attach";
@ -140,6 +146,11 @@ namespace fmtxml
"<line x1=\"19\" y1=\"-4\" x2=\"7\" y2=\"-16\" stroke=\"black\" stroke-width=\"0.85\" />" + "<line x1=\"19\" y1=\"-4\" x2=\"7\" y2=\"-16\" stroke=\"black\" stroke-width=\"0.85\" />" +
"</g></svg>"); "</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C3\">" +
"<text x=\"-10\" y=\"0\" font-family=\"Courier New\" font-size=\"12\">*</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
} }
private void AddEXCLN(XmlDocument myDoc) private void AddEXCLN(XmlDocument myDoc)
{ {
@ -151,6 +162,11 @@ namespace fmtxml
"<line x1=\"19\" y1=\"-4\" x2=\"7\" y2=\"-16\" stroke=\"black\" stroke-width=\"0.85\" />" + "<line x1=\"19\" y1=\"-4\" x2=\"7\" y2=\"-16\" stroke=\"black\" stroke-width=\"0.85\" />" +
"</g></svg>"); "</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true)); myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C3\">" +
"<text x=\"-10\" y=\"0\" font-family=\"Courier New\" font-size=\"12\">*</text>" +
"</g></svg>");
myDoc.DocumentElement.AppendChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true));
} }
} }
} }

Binary file not shown.