This commit is contained in:
Kathy Ruffing 2009-05-05 13:26:45 +00:00
parent 6f5eefd476
commit f276592b11

View File

@ -1332,7 +1332,7 @@ namespace fmtxml
};
private string[] Searchable = {
"False", "True", "True","True","True", "True", "True","True","True","True",
"True", "True", "False","False","True", "False","False","False","True","True","True","True",
"True", "True", "False","False","True", "False","False","True","True","True","True","True",
"True","True","True","False","True","True","True","True","True","True","True","True","True",
"True","True","True","True","True","True","True","False","False","True","True","True","False"
};
@ -1342,7 +1342,7 @@ namespace fmtxml
"Rev Number","Acc Pages","Boxed High Level Step","Explicit AND","Caution 1","Caution 2",
"Note 1","Note 2","Paragraph","Default","Note 3","Caution 3","Note 4","Caution 4",
"Optional Equipment List","Optional Equipment with Blank Line","Note 5","AER Table Without Border","Centered Table Without Border",
"Implicit OR","Centered","AER Figure","Centered Figure Without Border","AER Figure Without Border",
"Implicit OR","Centered Figure","AER Figure","Centered Figure Without Border","AER Figure Without Border",
"RNO Type","Alternate High Level Step","Title With Text Right","Title With Text Below",
"Continuous Action Sequential","Continuous Action AND","Continuous Action OR","Continuous Action Paragraph"
};
@ -1464,6 +1464,7 @@ namespace fmtxml
fmtName = nm;
//if (fmtName.ToUpper() != "CPLS" && fmtName.ToUpper() != "BASE") return;
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE") return;
//if (fmtName.ToUpper() != "HLP" && fmtName.ToUpper() != "BASE") return;
try
{
LoadFormatFile(nm + ".fmt", ref SubXtraFlags);
@ -2092,7 +2093,11 @@ namespace fmtxml
fmtdata.StepData[0].StepLayoutData.ForeColor = "Black";
fmtdata.StepData[0].StepLayoutData.BackColor = "White";
for (int i = 1; i < MAXSTEPS+1; i++) fmtdata.StepData[i].StepLayoutData.STExtraSpace = (RowToPoints(brFmt.ReadInt16())).ToString();
for (int i = 1; i < MAXSTEPS+1; i++) fmtdata.StepData[i].StepLayoutData.STBoxindex = (brFmt.ReadInt16()).ToString();
for (int i = 1; i < MAXSTEPS + 1; i++)
{
Int16 itmp = brFmt.ReadInt16();
if (fmtdata.StepData[i].Font != null && fmtdata.StepData[i].Font.IsBoxed) fmtdata.StepData[i].StepLayoutData.STBoxindex = (itmp+1).ToString();
}
// Read the tab indexes into a temporary array. Once the tab strings are read
// in the structure's data will be added.
@ -2751,13 +2756,11 @@ namespace fmtxml
if (indx > 0) fmtdata.StepData[TextTypeValue[i]].StepEditData.TypeMenu.MenuItem = GetStringFromByte(input, indx);
}
string mytmp = null;
//KBR TODO: is this still needed????
for (int i = 0; i < 16; i++)
{
indx = offset[arcnt];
arcnt++;
// KBR TODO: - Not sure what to do here 11/11/08: if (indx > 0) fmtdata.StepData[this.altsubsteps[i]].AlternateName = GetStringFromByte(input, indx);
if (indx > 0) mytmp = GetStringFromByte(input, indx);
if (indx > 0) fmtdata.StepData[this.altsubsteps[i]].StepEditData.TypeMenu.MenuItem = GetStringFromByte(input, indx);
}
indx = offset[arcnt];
@ -3365,16 +3368,15 @@ namespace fmtxml
}
else if (i == 30) // EquipmentOpt
{
// All EquipmentOpt get this thru inheritance
if (XtraFlags.DontBreakCautionsOrNotes == "True") fmtdata.StepData[i].Break = "False";
else fmtdata.StepData[i].Break = "True";
// All EquipmentOpt get this thru inheritance
if (XtraFlags.QuotedSubsteps == "True") fmtdata.StepData[i].Quoted = "True";
else fmtdata.StepData[i].Quoted = "False";
}
else if (i == 31) // EquipmentOptWBlank
{
// All EquipmentOptWBlank get this thru inheritance
if (XtraFlags.QuotedSubsteps == "True") fmtdata.StepData[i].Quoted = "True";
else fmtdata.StepData[i].Quoted = "False";
}
else if (i == 32) // Note5
{
@ -4279,14 +4281,15 @@ namespace fmtxml
Step sstp = subFmt.StepData[i];
if (mstp.Font != null && sstp.Font != null)
{
if (mstp.Font.FontFamily == mstp.Font.FontFamily) subFmt.StepData[i].Font.FontFamily = null;
if (mstp.Font.FontSize == mstp.Font.FontSize) subFmt.StepData[i].Font.FontSize = null;
if (mstp.Font.FontStyle == mstp.Font.FontStyle) subFmt.StepData[i].Font.FontStyle = null;
if (mstp.Font.FontFamily == sstp.Font.FontFamily) subFmt.StepData[i].Font.FontFamily = null;
if (mstp.Font.FontSize == sstp.Font.FontSize) subFmt.StepData[i].Font.FontSize = null;
if (mstp.Font.FontStyle == sstp.Font.FontStyle) subFmt.StepData[i].Font.FontStyle = null;
}
if (mstp.StepLayoutData.ForeColor == sstp.StepLayoutData.ForeColor) subFmt.StepData[i].StepLayoutData.ForeColor = null;
if (mstp.StepLayoutData.BackColor == sstp.StepLayoutData.BackColor) subFmt.StepData[i].StepLayoutData.BackColor = null;
if (mstp.StepLayoutData.STExtraSpace == sstp.StepLayoutData.STExtraSpace) subFmt.StepData[i].StepLayoutData.STExtraSpace = null;
if (mstp.StepLayoutData.STBoxindex == sstp.StepLayoutData.STBoxindex) subFmt.StepData[i].StepLayoutData.STBoxindex = null;
// don't inherit stboxindex because box definition may not be the same.
//if (mstp.StepLayoutData.STBoxindex == sstp.StepLayoutData.STBoxindex) subFmt.StepData[i].StepLayoutData.STBoxindex = null;
if (mstp.StepPrintData.PosAdjust == sstp.StepPrintData.PosAdjust) subFmt.StepData[i].StepPrintData.PosAdjust = null;
if (mstp.StepEditData.AcTable == sstp.StepEditData.AcTable) subFmt.StepData[i].StepEditData.AcTable = null;
if (mstp.StepLayoutData.EveryNLines == sstp.StepLayoutData.EveryNLines) subFmt.StepData[i].StepLayoutData.EveryNLines = null;