Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Continue CAL improvements

Browse Source
This commit is contained in:
Kathy Ruffing 2013-09-05 15:45:56 +00:00
parent 1d3a653e1a
commit 6fbbc29317
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PROMS/fmtxml/AppendPlantSpecific.cs
View File

@ -141,6 +141,9 @@ namespace fmtxml
{ {
fmtdata.StepData[9].TabData.Ident = " {!C0}{Section Prefix}{numeric}. "; fmtdata.StepData[9].TabData.Ident = " {!C0}{Section Prefix}{numeric}. ";
fmtdata.StepData[9].TabData.RNOIdent = " {!C0}{Section Prefix}. "; fmtdata.StepData[9].TabData.RNOIdent = " {!C0}{Section Prefix}. ";
fmtdata.StepData[9].TabData.MacroList[0].LocWithXOff = "True";
fmtdata.TransData.TransTypeData[5].TransFormat = "{Sect Num}, {Sect Title}, Step {First Step}";
fmtdata.TransData.TransTypeData[5].TransMenu = "{Sect Num}, {Sect Title}, Step {First Step}";
} }
private void AddIP3fmt(ref FormatData fmtdata) private void AddIP3fmt(ref FormatData fmtdata)
@ -1510,6 +1513,9 @@ namespace fmtxml
pgstyles.PgStyles[6].Items[2].Col = 240; pgstyles.PgStyles[6].Items[2].Col = 240;
pgstyles.PgStyles[6].Items[3].Col = 240; pgstyles.PgStyles[6].Items[3].Col = 240;
pgstyles.PgStyles[6].Items[4].Col = 240; pgstyles.PgStyles[6].Items[4].Col = 240;
pgstyles.PgStyles[6].Items[3].Row = 295;
pgstyles.PgStyles[6].Items[4].Row = 317;
pgstyles.PgStyles[6].Items[3].Justify = pgstyles.PgStyles[6].Items[4].Justify;
pgstyles.PgStyles[6].Items[3].Style.FontSize = "14"; pgstyles.PgStyles[6].Items[3].Style.FontSize = "14";
pgstyles.PgStyles[6].Items[4].Style.FontSize = "14"; pgstyles.PgStyles[6].Items[4].Style.FontSize = "14";
pgstyles.PgStyles[6].Items[5].Col = 240; pgstyles.PgStyles[6].Items[5].Col = 240;
@ -2916,9 +2922,18 @@ namespace fmtxml
case "FNP.DOC": case "FNP.DOC":
AddFNPDOC(ref dcstyles); AddFNPDOC(ref dcstyles);
break; break;
case "CAL2.DOC":
case "CALOTO.DOC":
case "CAL2.Y00":
AddCAL2DOC(ref dcstyles);
break;
} }
} }
private void AddCAL2DOC(ref DocStyles dcstyles)
{
dcstyles.DcStyles[1].PageLength = 672;
}
private void AddFNPDOC(ref DocStyles dcstyles) private void AddFNPDOC(ref DocStyles dcstyles)
{ {
dcstyles.DcStyles[2].AlignHLSTabWithSect = true; dcstyles.DcStyles[2].AlignHLSTabWithSect = true;
@ -3391,9 +3406,9 @@ namespace fmtxml
{ {
XmlDocument xdNew = new XmlDocument(); XmlDocument xdNew = new XmlDocument();
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C22\">" + xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C22\">" +
"<text x=\"-7.3\" y=\"-11.3\" font-family=\"Courier New\" font-size=\"12\">__</text>" + "<text x=\"8\" y=\"-11.5\" font-family=\"Courier New\" font-size=\"12\">__</text>" +
"<text x=\"-7.3\" y=\"-0.25\" font-family=\"Courier New\" font-size=\"12\">__</text>" + "<text x=\"8\" y=\"-0.25\" font-family=\"Courier New\" font-size=\"12\">__</text>" +
"<text x=\"-23.75\" y=\"-0.85\" font-family=\"Courier New\" font-size=\"12\">#</text>" + "<text x=\"-9.5\" y=\"-0.85\" font-family=\"Courier New\" font-size=\"12\">#</text>" +
"</g></svg>"); "</g></svg>");
myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[10]); myDoc.DocumentElement.ReplaceChild(myDoc.ImportNode(xdNew.DocumentElement.ChildNodes[0], true), myDoc.DocumentElement.ChildNodes[10]);
@ -3403,8 +3418,8 @@ namespace fmtxml
{ {
XmlDocument xdNew = new XmlDocument(); XmlDocument xdNew = new XmlDocument();
xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C22\">" + xdNew.LoadXml("<svg xmlns=\"http://www.w3.org/2000/svg\"> <g id=\"C22\">" +
"<text x=\"0\" y=\"-11.3\" font-family=\"Courier New\" font-size=\"12\">__</text>" + "<text x=\"8\" y=\"-11.5\" font-family=\"Courier New\" font-size=\"12\">__</text>" +
"<text x=\"0\" y=\"-0.25\" font-family=\"Courier New\" font-size=\"12\">__</text>" + "<text x=\"8\" y=\"-0.25\" font-family=\"Courier New\" font-size=\"12\">__</text>" +
"<text x=\"-5.95\" y=\"-0.85\" font-family=\"Courier New\" font-size=\"12\">#</text>" + "<text x=\"-5.95\" y=\"-0.85\" font-family=\"Courier New\" font-size=\"12\">#</text>" +
"</g></svg>"); "</g></svg>");

8
PROMS/fmtxml/FmtFileToXml.cs
View File

@ -1039,6 +1039,7 @@ public struct COMacro
public string Macro; public string Macro;
public string Grouping; public string Grouping;
public string NotInRNO; public string NotInRNO;
public string LocWithXOff;
} }
[Serializable] [Serializable]
public struct Box public struct Box
@ -5367,6 +5368,11 @@ namespace fmtxml
if (stp.TabData.MacroList == null || stp.TabData.MacroList[0].Macro == null) return null; if (stp.TabData.MacroList == null || stp.TabData.MacroList[0].Macro == null) return null;
return stp.TabData.MacroList[0].Macro; return stp.TabData.MacroList[0].Macro;
} }
private string StepPartTabMacroListLocWithXOff(Step stp)
{
if (stp.TabData.MacroList == null || stp.TabData.MacroList[0].LocWithXOff == null) return null;
return stp.TabData.MacroList[0].LocWithXOff;
}
private string StepPartTabMacroListGrouping(Step stp) private string StepPartTabMacroListGrouping(Step stp)
{ {
if (stp.TabData.MacroList == null || stp.TabData.MacroList[0].Grouping == null) return null; if (stp.TabData.MacroList == null || stp.TabData.MacroList[0].Grouping == null) return null;
@ -5504,11 +5510,13 @@ namespace fmtxml
if (CheckInheritedStr(new StepPartStr(StepPartTabMacroListName), step, dicParents) && if (CheckInheritedStr(new StepPartStr(StepPartTabMacroListName), step, dicParents) &&
CheckInheritedStr(new StepPartStr(StepPartTabMacroListMacro), step, dicParents) && CheckInheritedStr(new StepPartStr(StepPartTabMacroListMacro), step, dicParents) &&
CheckInheritedStr(new StepPartStr(StepPartTabMacroListGrouping), step, dicParents) && CheckInheritedStr(new StepPartStr(StepPartTabMacroListGrouping), step, dicParents) &&
CheckInheritedStr(new StepPartStr(StepPartTabMacroListLocWithXOff), step, dicParents) &&
CheckInheritedStr(new StepPartStr(StepPartTabMacroListNotInRNO), step, dicParents)) CheckInheritedStr(new StepPartStr(StepPartTabMacroListNotInRNO), step, dicParents))
{ {
step.TabData.MacroList[0].Macro = null; step.TabData.MacroList[0].Macro = null;
step.TabData.MacroList[0].Grouping = NullString; step.TabData.MacroList[0].Grouping = NullString;
step.TabData.MacroList[0].NotInRNO = null; step.TabData.MacroList[0].NotInRNO = null;
step.TabData.MacroList[0].LocWithXOff = null;
} }
} }

BIN
PROMS/fmtxml/TranslateFMT.XSL
View File

Binary file not shown.