added NSP specific, removed IdentWid’s
removed IdentWid’s, added TabBullet setup DocStyle to inherit from the section’s default, not Base, added Plant specific for PageStyles (pagelist)
This commit is contained in:
parent
0e9a7efdae
commit
f41b211187
@ -28,6 +28,9 @@ namespace fmtxml
|
||||
case "WCNCKL":
|
||||
AddWCNCKLFmt(ref fmtdata);
|
||||
break;
|
||||
case "NSP":
|
||||
AddNSPFMT(ref fmtdata);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -64,16 +67,14 @@ namespace fmtxml
|
||||
fmtdata.StepData[2].TabData.IdentEdit = " {numeric} ";
|
||||
fmtdata.StepData[2].TabData.RNOIdentEdit="";
|
||||
fmtdata.StepData[2].TabData.RNOIdent="";
|
||||
fmtdata.StepData[2].TabData.IdentEditWid="";
|
||||
fmtdata.StepData[2].TabData.IdentWid="18";
|
||||
fmtdata.StepData[2].TabData.RNOIdentEditWid="18";
|
||||
fmtdata.StepData[2].TabData.RNOIdentWid = "18";
|
||||
//fmtdata.StepData[2].TabData.IdentEditWid="";
|
||||
//fmtdata.StepData[2].TabData.IdentWid="18";
|
||||
//fmtdata.StepData[2].TabData.RNOIdentEditWid="18";
|
||||
//fmtdata.StepData[2].TabData.RNOIdentWid = "18";
|
||||
fmtdata.StepData[9].TabData.IdentEdit="*{numeric} ";
|
||||
fmtdata.StepData[9].TabData.Ident="*{numeric} ";
|
||||
fmtdata.StepData[9].TabData.RNOIdentEdit="* ";
|
||||
fmtdata.StepData[9].TabData.RNOIdent = "* ";
|
||||
|
||||
|
||||
}
|
||||
private void AddWCN2Fmt(ref FormatData fmtdata)
|
||||
{
|
||||
@ -87,6 +88,233 @@ namespace fmtxml
|
||||
fmtdata.StepData[9].TabData.RNOIdent = fmtdata.StepData[9].TabData.RNOIdent + " ";
|
||||
fmtdata.StepData[9].TabData.RNOIdentEdit = fmtdata.StepData[9].TabData.RNOIdentEdit + " ";
|
||||
}
|
||||
private void AddNSPFMT(ref FormatData fmtdata)
|
||||
{
|
||||
// Cautions use Arial Font for Tab (instead of Script) and
|
||||
// any bullets following the tab are at a different point size
|
||||
fmtdata.StepData[6].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[6].Font.FontSize = "10";
|
||||
fmtdata.StepData[6].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[6].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[6].TabData.Font.FontSize = "14";
|
||||
fmtdata.StepData[6].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[6].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[6].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[6].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[6].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[6].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
|
||||
//fmtdata.StepData[20] = fmtdata.StepData[6];
|
||||
//fmtdata.StepData[20].Type = "Caution1";
|
||||
//fmtdata.StepData[20].ParentType = "Caution";
|
||||
fmtdata.StepData[20].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[20].Font.FontSize = "10";
|
||||
fmtdata.StepData[20].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[20].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[20].TabData.Font.FontSize = "14";
|
||||
fmtdata.StepData[20].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[20].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[20].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[20].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[20].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[20].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
|
||||
//fmtdata.StepData[21] = fmtdata.StepData[6];
|
||||
//fmtdata.StepData[21].Type = "Caution2";
|
||||
//fmtdata.StepData[21].ParentType = "Caution";
|
||||
fmtdata.StepData[21].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[21].Font.FontSize = "10";
|
||||
fmtdata.StepData[21].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[21].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[21].TabData.Font.FontSize = "14";
|
||||
fmtdata.StepData[21].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[21].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[21].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[21].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[21].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[21].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
|
||||
//fmtdata.StepData[27] = fmtdata.StepData[6];
|
||||
//fmtdata.StepData[27].Type = "Caution3";
|
||||
//fmtdata.StepData[27].ParentType = "Caution";
|
||||
fmtdata.StepData[27].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[27].Font.FontSize = "10";
|
||||
fmtdata.StepData[27].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[27].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[27].TabData.Font.FontSize = "14";
|
||||
fmtdata.StepData[27].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[27].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[27].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[27].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[27].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[27].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
|
||||
//fmtdata.StepData[29] = fmtdata.StepData[6];
|
||||
//fmtdata.StepData[29].Type = "Caution4";
|
||||
//fmtdata.StepData[29].ParentType = "Caution";
|
||||
fmtdata.StepData[29].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[29].Font.FontSize = "10";
|
||||
fmtdata.StepData[29].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[29].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[29].TabData.Font.FontSize = "14";
|
||||
fmtdata.StepData[29].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[29].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[29].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[29].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[29].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[29].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
|
||||
// Notes used Arial font and any bullets following the tab are at
|
||||
// a different point size
|
||||
fmtdata.StepData[7].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[7].Font.FontSize = "10";
|
||||
fmtdata.StepData[7].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[7].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[7].TabData.Font.FontSize = "10";
|
||||
fmtdata.StepData[7].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[7].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[7].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[7].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[7].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[7].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
fmtdata.StepData[7].TabData.Ident = "Note ";
|
||||
fmtdata.StepData[7].TabData.RNOIdent = "Note ";
|
||||
//fmtdata.StepData[7].TabData.IdentWid = "65.4";
|
||||
|
||||
//fmtdata.StepData[22] = fmtdata.StepData[7];
|
||||
//fmtdata.StepData[22].Type = "Note1";
|
||||
//fmtdata.StepData[22].ParentType = "Note";
|
||||
fmtdata.StepData[22].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[22].Font.FontSize = "10";
|
||||
fmtdata.StepData[22].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[22].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[22].TabData.Font.FontSize = "10";
|
||||
fmtdata.StepData[22].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[22].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[22].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[22].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[22].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[22].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
fmtdata.StepData[22].TabData.Ident = "Note ";
|
||||
fmtdata.StepData[22].TabData.RNOIdent = "Note ";
|
||||
//fmtdata.StepData[22].TabData.IdentWid = "65.4";
|
||||
|
||||
//fmtdata.StepData[23] = fmtdata.StepData[7];
|
||||
//fmtdata.StepData[23].Type = "Note2";
|
||||
//fmtdata.StepData[23].ParentType = "Note";
|
||||
fmtdata.StepData[23].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[23].Font.FontSize = "10";
|
||||
fmtdata.StepData[23].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[23].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[23].TabData.Font.FontSize = "10";
|
||||
fmtdata.StepData[23].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[23].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[23].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[23].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[23].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[23].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
fmtdata.StepData[23].TabData.Ident = "Note ";
|
||||
fmtdata.StepData[23].TabData.RNOIdent = "Note ";
|
||||
//fmtdata.StepData[23].TabData.IdentWid = "65.4";
|
||||
|
||||
//fmtdata.StepData[26] = fmtdata.StepData[7];
|
||||
//fmtdata.StepData[26].Type = "Note3";
|
||||
//fmtdata.StepData[26].ParentType = "Note";
|
||||
fmtdata.StepData[26].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[26].Font.FontSize = "10";
|
||||
fmtdata.StepData[26].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[26].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[26].TabData.Font.FontSize = "10";
|
||||
fmtdata.StepData[26].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[26].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[26].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[26].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[26].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[26].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
fmtdata.StepData[26].TabData.Ident = "Note ";
|
||||
fmtdata.StepData[26].TabData.RNOIdent = "Note ";
|
||||
//fmtdata.StepData[26].TabData.IdentWid = "65.4";
|
||||
|
||||
//fmtdata.StepData[28] = fmtdata.StepData[7];
|
||||
//fmtdata.StepData[28].Type = "Note4";
|
||||
//fmtdata.StepData[28].ParentType = "Note";
|
||||
fmtdata.StepData[28].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[28].Font.FontSize = "10";
|
||||
fmtdata.StepData[28].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[28].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[28].TabData.Font.FontSize = "10";
|
||||
fmtdata.StepData[28].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[28].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[28].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[28].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[28].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[28].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
fmtdata.StepData[28].TabData.Ident = "Note ";
|
||||
fmtdata.StepData[28].TabData.RNOIdent = "Note ";
|
||||
//fmtdata.StepData[28].TabData.IdentWid = "65.4";
|
||||
|
||||
//fmtdata.StepData[32] = fmtdata.StepData[7];
|
||||
//fmtdata.StepData[32].Type = "Note5";
|
||||
//fmtdata.StepData[32].ParentType = "Note";
|
||||
fmtdata.StepData[32].Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[32].Font.FontSize = "10";
|
||||
fmtdata.StepData[32].Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[32].TabData.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[32].TabData.Font.FontSize = "10";
|
||||
fmtdata.StepData[32].TabData.Font.FontStyle = "Italics, Bold";
|
||||
fmtdata.StepData[32].TabData.Bullet.Separate = "True";
|
||||
fmtdata.StepData[32].TabData.Bullet.Font = new VE_Font();
|
||||
fmtdata.StepData[32].TabData.Bullet.Font.FontFamily = "Arial";
|
||||
fmtdata.StepData[32].TabData.Bullet.Font.FontSize = "10";
|
||||
fmtdata.StepData[32].TabData.Bullet.Font.FontStyle = "Bold";
|
||||
fmtdata.StepData[32].TabData.Ident = "Note ";
|
||||
fmtdata.StepData[32].TabData.RNOIdent = "Note ";
|
||||
//fmtdata.StepData[32].TabData.IdentWid = "65.4";
|
||||
|
||||
}
|
||||
}
|
||||
public partial class FmtToXml
|
||||
{
|
||||
public void AddPlantSpecific(string genFileName, ref PageStyles pgstyles)
|
||||
{
|
||||
//string genName = genFileName.Substring(genFileName.LastIndexOf('\\') + 1);
|
||||
//genName = genName.Substring(0, genName.IndexOf('.'));
|
||||
//switch (genName.ToUpper())
|
||||
switch (genFileName.ToUpper())
|
||||
{
|
||||
case "NSP.PAG":
|
||||
AddNSPPage(ref pgstyles);
|
||||
break;
|
||||
}
|
||||
}
|
||||
// NSP_ALL
|
||||
private void AddNSPPage(ref PageStyles pgstyles)
|
||||
{
|
||||
// Procedure Steps
|
||||
pgstyles.PgStyles[0].Items[1].Col = -16; // {HEADER1}
|
||||
pgstyles.PgStyles[0].Items[2].Col = 249; // {PROCTITLE} made positioning consistant - will not match 16-bit
|
||||
pgstyles.PgStyles[0].Items[5].Col = -16; // {BOX2}
|
||||
// Figure Included in Page Count
|
||||
pgstyles.PgStyles[1].Items[1].Col = -16; // {HEADER1}
|
||||
pgstyles.PgStyles[1].Items[3].Col = 453; // {REV} made positioning consistant - will not match 16-bit
|
||||
pgstyles.PgStyles[1].Items[4].Col = 24; // {EOPNUM} made positioning consistant - will not match 16-bit
|
||||
pgstyles.PgStyles[1].Items[5].Col = -16; // {BOX1}
|
||||
// Cover Sheet 2004 With no Retention
|
||||
pgstyles.PgStyles[3].Items[1].Col = -16; // {HEADER1}
|
||||
pgstyles.PgStyles[3].Items[3].Col = 453; // {REV} made positioning consistant - will not match 16-bit
|
||||
pgstyles.PgStyles[3].Items[4].Col = 24; // {EOPNUM} made positioning consistant - will not match 16-bit
|
||||
// Purpose And Entry Conditions with Header Box
|
||||
pgstyles.PgStyles[6].Items[1].Col = -16; // {HEADER1}
|
||||
pgstyles.PgStyles[6].Items[3].Col = 453; // {REV} made positioning consistant - will not match 16-bit
|
||||
pgstyles.PgStyles[6].Items[4].Col = 24; // {EOPNUM} made positioning consistant - will not match 16-bit
|
||||
// Two Column Auto Action Pages
|
||||
pgstyles.PgStyles[7].Items[1].Col = 505; // {REV} made positioning consistant - will not match 16-bit
|
||||
pgstyles.PgStyles[7].Items[2].Col = 505; // {EOPNUM} made positioning consistant - will not match 16-bit
|
||||
pgstyles.PgStyles[7].Items[4].Col = -16; // {BOX2}
|
||||
// Auto Continuous Action Summary
|
||||
pgstyles.PgStyles[8].Items[1].Col = -16; // {HEADER1}
|
||||
pgstyles.PgStyles[8].Items[5].Col = -16; // {BOX4}
|
||||
}
|
||||
}
|
||||
public partial class RtfToSvg
|
||||
{
|
||||
|
||||
@ -1003,14 +1003,15 @@ public struct Tab
|
||||
public string IdentAltPrint;
|
||||
public string RNOIdentEdit;
|
||||
public string RNOIdent;
|
||||
public string IdentEditWid;
|
||||
public string IdentWid;
|
||||
public string RNOIdentEditWid;
|
||||
public string RNOIdentWid;
|
||||
//public string IdentEditWid;
|
||||
//public string IdentWid;
|
||||
//public string RNOIdentEditWid;
|
||||
//public string RNOIdentWid;
|
||||
public string Justify; // from tbstyle - None, CENTER, LEFT, RIGHT
|
||||
public string UsePreviousStyle;
|
||||
public COMacro[] MacroList;
|
||||
public VE_Font Font;
|
||||
public VE_Font Font;
|
||||
public TabBullet Bullet;
|
||||
}
|
||||
[Serializable]
|
||||
public struct COMacro
|
||||
@ -1093,6 +1094,13 @@ public struct RO
|
||||
public string CapFirstLetterInHighRO; //CAPFIRSTLETTERINHIGHSP
|
||||
/* End of Format flags */
|
||||
}
|
||||
[Serializable]
|
||||
public struct TabBullet
|
||||
{
|
||||
public string Separate;
|
||||
public VE_Font Font;
|
||||
}
|
||||
|
||||
[Flags]
|
||||
public enum E_TransitionMenus : uint
|
||||
{
|
||||
@ -2727,9 +2735,9 @@ namespace fmtxml
|
||||
if (Tabindx[i] == j)
|
||||
{
|
||||
fmtdata.StepData[i + 1].TabData.IdentEdit = DoTabs(fmtdata.StepData[i].TabData.Font, fmtdata.PurchaseOptions, i, tabstrings[j, 0], true);
|
||||
fmtdata.StepData[i + 1].TabData.IdentEditWid = CalculateTabWid(tabstrings[j, 0]).ToString();
|
||||
//fmtdata.StepData[i + 1].TabData.IdentEditWid = CalculateTabWid(tabstrings[j, 0]).ToString();
|
||||
fmtdata.StepData[i + 1].TabData.Ident = DoTabs(fmtdata.StepData[i].TabData.Font, fmtdata.PurchaseOptions, i, tabstrings[j, 1], true);
|
||||
fmtdata.StepData[i + 1].TabData.IdentWid = CalculateTabWid(tabstrings[j, 1]).ToString();
|
||||
//fmtdata.StepData[i + 1].TabData.IdentWid = CalculateTabWid(tabstrings[j, 1]).ToString();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -3133,9 +3141,9 @@ namespace fmtxml
|
||||
if (Tabindx[i] == j)
|
||||
{
|
||||
fmtdata.StepData[i + 1].TabData.RNOIdentEdit = DoTabs(fmtdata.StepData[i].TabData.Font, fmtdata.PurchaseOptions, i, tabstrings[j, 0], fmtdata.StepData[i].StepNumberForHighLevel == "True");
|
||||
fmtdata.StepData[i + 1].TabData.RNOIdentEditWid = CalculateTabWid(tabstrings[j, 0]).ToString();
|
||||
//fmtdata.StepData[i + 1].TabData.RNOIdentEditWid = CalculateTabWid(tabstrings[j, 0]).ToString();
|
||||
fmtdata.StepData[i + 1].TabData.RNOIdent = DoTabs(fmtdata.StepData[i].TabData.Font, fmtdata.PurchaseOptions, i, tabstrings[j, 1], fmtdata.StepData[i].StepNumberForHighLevel == "True");
|
||||
fmtdata.StepData[i + 1].TabData.RNOIdentWid = CalculateTabWid(tabstrings[j, 1]).ToString();
|
||||
//fmtdata.StepData[i + 1].TabData.RNOIdentWid = CalculateTabWid(tabstrings[j, 1]).ToString();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -5215,10 +5223,10 @@ namespace fmtxml
|
||||
private string StepPartTabIdent(Step stp) { return stp.TabData.Ident; }
|
||||
private string StepPartTabRNOIdentEdit(Step stp) { return stp.TabData.RNOIdentEdit; }
|
||||
private string StepPartTabRNOIdent(Step stp) { return stp.TabData.RNOIdent; }
|
||||
private string StepPartTabIdentEditWid(Step stp) { return stp.TabData.IdentEditWid; }
|
||||
private string StepPartTabIdentWid(Step stp) { return stp.TabData.IdentWid; }
|
||||
private string StepPartTabRNOIdentEditWid(Step stp) { return stp.TabData.RNOIdentEditWid; }
|
||||
private string StepPartTabRNOIdentWid(Step stp) { return stp.TabData.RNOIdentWid; }
|
||||
//private string StepPartTabIdentEditWid(Step stp) { return stp.TabData.IdentEditWid; }
|
||||
//private string StepPartTabIdentWid(Step stp) { return stp.TabData.IdentWid; }
|
||||
//private string StepPartTabRNOIdentEditWid(Step stp) { return stp.TabData.RNOIdentEditWid; }
|
||||
//private string StepPartTabRNOIdentWid(Step stp) { return stp.TabData.RNOIdentWid; }
|
||||
private string StepPartTabJustify(Step stp) { return stp.TabData.Justify; }
|
||||
|
||||
// Do the flags:
|
||||
@ -5422,10 +5430,10 @@ namespace fmtxml
|
||||
if (CheckInheritedStr(new StepPartStr(StepPartTabIdent), step, dicParents)) step.TabData.Ident = null;
|
||||
if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentEdit), step, dicParents)) step.TabData.RNOIdentEdit = null;
|
||||
if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdent), step, dicParents)) step.TabData.RNOIdent = null;
|
||||
if (CheckInheritedStr(new StepPartStr(StepPartTabIdentEditWid), step, dicParents)) step.TabData.IdentEditWid = NullString;
|
||||
if (CheckInheritedStr(new StepPartStr(StepPartTabIdentWid), step, dicParents)) step.TabData.IdentWid = NullString;
|
||||
if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentEditWid), step, dicParents)) step.TabData.RNOIdentEditWid = NullString;
|
||||
if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentWid), step, dicParents)) step.TabData.RNOIdentWid = NullString;
|
||||
//if (CheckInheritedStr(new StepPartStr(StepPartTabIdentEditWid), step, dicParents)) step.TabData.IdentEditWid = NullString;
|
||||
//if (CheckInheritedStr(new StepPartStr(StepPartTabIdentWid), step, dicParents)) step.TabData.IdentWid = NullString;
|
||||
//if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentEditWid), step, dicParents)) step.TabData.RNOIdentEditWid = NullString;
|
||||
//if (CheckInheritedStr(new StepPartStr(StepPartTabRNOIdentWid), step, dicParents)) step.TabData.RNOIdentWid = NullString;
|
||||
if (CheckInheritedStr(new StepPartStr(StepPartTabJustify), step, dicParents)) step.TabData.Justify = null;
|
||||
//if (CheckInheritedStr(new StepPartStr(StepPartTabCheckOff), step, dicParents)) step.TabData.CheckOff = null;
|
||||
|
||||
|
||||
@ -485,7 +485,7 @@ internal class VE_FontConverter:ExpandableObjectConverter
|
||||
///////////////////////////
|
||||
namespace fmtxml
|
||||
{
|
||||
public class FmtToXml
|
||||
public partial class FmtToXml
|
||||
{
|
||||
private BinaryReader brFmt;
|
||||
private string fmtName;
|
||||
@ -737,6 +737,7 @@ namespace fmtxml
|
||||
if (didNewPageStyle) pgs[numpgstyles] = AddPageStyles(fname);
|
||||
brFmt.Close();
|
||||
DoPSFontInherit(ref pgstyles);
|
||||
AddPlantSpecific(fname, ref pgstyles);
|
||||
|
||||
// First serialize files based on the above - then use xsl to transform
|
||||
// into prefered xml.
|
||||
@ -933,7 +934,7 @@ namespace fmtxml
|
||||
{
|
||||
fmtFileName = MyPath + @"\" + fname.Substring(0, fname.IndexOf(".")) + ".FMT";
|
||||
}
|
||||
if (fname == "CPL.Y01") Console.WriteLine(fname);
|
||||
//if (fname == "CPL.Y01") Console.WriteLine(fname);
|
||||
brFmt = new BinaryReader(File.Open(fnm,System.IO.FileMode.Open,System.IO.FileAccess.ReadWrite,FileShare.ReadWrite));
|
||||
dcstyles.Name = GetAsciiString(brFmt);
|
||||
bool didNewDocStyle = false;
|
||||
@ -1346,7 +1347,9 @@ namespace fmtxml
|
||||
CompareFonts(DefPlantFont, ref docstyles.DcStyles[i].ContStyle);
|
||||
CompareFonts(DefBaseFont, ref docstyles.DcStyles[i].ContStyle);
|
||||
CompareFonts(DefPlantFont, ref docstyles.DcStyles[i].dstyle);
|
||||
CompareFonts(DefBaseFont, ref docstyles.DcStyles[i].dstyle);
|
||||
// The default font for the DocStyle only inherit from the Plant Format not from Base format
|
||||
// This allows pagelist items to inherit from the section's default font setting when printing.
|
||||
//CompareFonts(DefBaseFont, ref docstyles.DcStyles[i].dstyle);
|
||||
}
|
||||
}
|
||||
private bool GetPlantBaseDefaultFonts()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user