Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files

8
PROMS/fmtxml/FmtFileToXml.cs
View File

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