This commit is contained in:
2011-11-21 16:37:30 +00:00
parent 718b4d9dc0
commit 19349d9fcd
7 changed files with 91 additions and 35 deletions

View File

@@ -513,7 +513,8 @@ public struct CheckOffData
public string AllowSectEdit;
public string AllowStepEdit;
public int UseCheckOffsIn;
public sbyte CheckOffAdjustment;
public float CheckOffAdjustment;
public float XLocation;
/* Format flags ... */
public string DropCheckOff;
public string CheckOffOnHLSOnly;
@@ -785,7 +786,6 @@ public struct StepSectionEdit
public struct SeqTabFmt
{
public int Index;
public int LeftJustify;
public string TabToken;
public string TabFormat;
public string PrintTabFormat;
@@ -805,9 +805,16 @@ public struct StepSectionPrint
/* End of format flags */
public VE_Font ModifiedTextStyle;
public VE_Font ImmStepHdrStyle;
public LeftJustify[] LeftJustifyList;
public string[] ImmStepHdr;
}
[Serializable]
public struct LeftJustify
{
public int Index;
public float Size;
}
[Serializable]
public struct ReplaceStr
{
public string Flag;
@@ -1546,7 +1553,7 @@ namespace fmtxml
fmtName = alias;
//if (fmtName.ToUpper() != "CPLS" && fmtName.ToUpper() != "BASE") return;
//if (fmtName.ToUpper() != "OHLP" && fmtName.ToUpper() != "BASE" && fmtName.ToUpper() != "WCN2") return;
//if (fmtName.ToUpper() != "WCN2" && fmtName.ToUpper() != "BASE") return;
//if (fmtName.ToUpper() != "WCN1" && fmtName.ToUpper() != "BASE") return;
try
{
LoadFormatFile(nm + ".fmt", ref SubXtraFlags);
@@ -2421,6 +2428,10 @@ namespace fmtxml
for (int i = 0; i < MAXCHKHEADINGS; i++) fmtdata.ProcData.CheckOffData.CheckOffHeaderList[i].Index = i;
for (int i = 0; i < MAXCHKHEADINGS; i++) fmtdata.ProcData.CheckOffData.CheckOffHeaderList[i].Font = LoadVE_Font();
fmtdata.ProcData.CheckOffData.UseCheckOffsIn = brFmt.ReadInt32();
// 16 bit code was defaulting to Elite when calculating the starting location of the check off line.
// so use elite: 72 points per inch, 12 chars per inch
int tmpcolco = (rightCheckOffBox[3] & 0xFF) * 72/12;
if (tmpcolco > 0) fmtdata.ProcData.CheckOffData.XLocation = (float)tmpcolco; // ColToPoints((float)tmpcolco, _PlantDefaultFontStyle);
tmplong = (int)brFmt.ReadUInt32();
fmtdata.SectData.StepSectionData.StpSectLayData.EndMessagePos = brFmt.ReadInt16();
tmpshort = brFmt.ReadInt16(); // CenterTableAdjustment
@@ -2517,7 +2528,7 @@ namespace fmtxml
accsec.TableOfContentsData = toc;
for (int i = 0; i < MAXSTEPS; i++) tmpbyte = brFmt.ReadByte();
fmtdata.ProcData.CheckOffData.CheckOffAdjustment = brFmt.ReadSByte();
fmtdata.ProcData.CheckOffData.CheckOffAdjustment = ColToPoints(Convert.ToInt16(brFmt.ReadSByte()), _PlantDefaultFontStyle);
tmpshort = brFmt.ReadInt16(); // ColsAdjustInS2
tmpbyte = brFmt.ReadByte(); // SeriesTitleLength;
@@ -2551,13 +2562,14 @@ namespace fmtxml
for (int i = 0; i < 3; i++) tmpbyte3[i] = brFmt.ReadSByte();
tmpstr = string.Format("{0}, {1}, {2}", tmpbyte3[0], tmpbyte3[1], tmpbyte3[2]);
fmtdata.SectData.StepSectionData.StpSectLayData.TableCenterPos = tmpstr;
//short[] tmpint9 = new short[9];
//for (int i = 0; i < 9; i++) tmpint9[i] = brFmt.ReadInt16();
//tmpstr = string.Format("{0},{1},{2},{3},{4},{5},{6},{7},{8}", tmpint9[0], tmpint9[1], tmpint9[2], tmpint9[3], tmpint9[4], tmpint9[5], tmpint9[6], tmpint9[7], tmpint9[8]);
//fmtdata.SectData.StepSectionData.LeftJustSeqTab = tmpstr;
for (int i = 0; i < MAXSEQ; i++) fmtdata.SectData.StepSectionData.SequentialTabFormat[i].Index = i;
for (int i = 0; i < MAXSEQ; i++) fmtdata.SectData.StepSectionData.SequentialTabFormat[i].LeftJustify = brFmt.ReadInt16();
LeftJustify[] lftjust = new LeftJustify[MAXSEQ];
fmtdata.SectData.StepSectionData.StpSectPrtData.LeftJustifyList = lftjust;
for (int i = 0; i < MAXSEQ; i++)
{
lftjust[i].Index = i;
lftjust[i].Size = ColToPoints(brFmt.ReadInt16(), _PlantDefaultFontStyle); //brFmt.ReadInt16();
}
MetaSection[] metsects = new MetaSection[10];
fmtdata.SectData.MetaSectionData = metsects;
for (int i = 0; i < 10; i++) metsects[i].Index = i;
@@ -4780,6 +4792,7 @@ namespace fmtxml
if (mco.AllowSectEdit == sco.AllowSectEdit) subFmt.ProcData.CheckOffData.AllowSectEdit = "null";
if (mco.AllowStepEdit == sco.AllowStepEdit) subFmt.ProcData.CheckOffData.AllowStepEdit = "null";
if (mco.UseCheckOffsIn == sco.UseCheckOffsIn) subFmt.ProcData.CheckOffData.UseCheckOffsIn = 0;
if (mco.XLocation == sco.XLocation) subFmt.ProcData.CheckOffData.XLocation = 0;
if (mco.CheckOffAdjustment == sco.CheckOffAdjustment) subFmt.ProcData.CheckOffData.CheckOffAdjustment = 0;
if (mco.DropCheckOff != null && mco.DropCheckOff == sco.DropCheckOff) subFmt.ProcData.CheckOffData.DropCheckOff = "null";
if (mco.CheckOffOnHLSOnly != null && mco.CheckOffOnHLSOnly == sco.CheckOffOnHLSOnly) subFmt.ProcData.CheckOffData.CheckOffOnHLSOnly = "null";