- Added ShortPath Property to ItemInfo

- Added MacroList
Added CheckOff data
Added CheckOff and ChangeBar
Fixed inheritance
This commit is contained in:
Rich
2010-05-25 16:11:23 +00:00
parent f21a49d75e
commit 8fd6c2eac4
4 changed files with 402 additions and 95 deletions

View File

@@ -777,14 +777,6 @@ namespace VEPROMS.CSLA.Library
public class CheckOffData : vlnFormatItem
{
public CheckOffData(XmlNode xmlNode) : base(xmlNode) { }
private RightCheckOffBoxList _RightCheckOffBoxList;
public RightCheckOffBoxList RightCheckOffBoxList
{
get
{
return _RightCheckOffBoxList == null? _RightCheckOffBoxList = new RightCheckOffBoxList(SelectNodes("RightCheckOffBoxList/RightCheckOffBox"),MyFormat):_RightCheckOffBoxList;
}
}
private CheckOffList _CheckOffList;
public CheckOffList CheckOffList
{
@@ -801,13 +793,29 @@ namespace VEPROMS.CSLA.Library
return _CheckOffHeaderList == null? _CheckOffHeaderList = new CheckOffHeaderList(SelectNodes("CheckOffHeaderList/CheckOffHeader"),MyFormat): _CheckOffHeaderList;
}
}
private LazyLoad<int?> _UseCheckOffsIn;
public int? UseCheckOffsIn
{
get
private LazyLoad<string> _Menu;
public string Menu
{
get
{
return LazyLoad(ref _UseCheckOffsIn, "@UseCheckOffsIn");
}
return LazyLoad(ref _Menu, "@Menu");
}
}
private LazyLoad<bool> _AllowSectEdit;
public bool AllowSectEdit
{
get
{
return LazyLoad(ref _AllowSectEdit, "@AllowSectEdit");
}
}
private LazyLoad<bool> _AllowStepEdit;
public bool AllowStepEdit
{
get
{
return LazyLoad(ref _AllowStepEdit, "@AllowStepEdit");
}
}
private LazyLoad<int?> _CheckOffAdjustment;
public int? CheckOffAdjustment
@@ -817,6 +825,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _CheckOffAdjustment, "@CheckOffAdjustment");
}
}
private LazyLoad<int?> _CheckOffXtraLines;
public int? CheckOffXtraLines
{
get
{
return LazyLoad(ref _CheckOffXtraLines, "@CheckOffXtraLines");
}
}
private LazyLoad<bool> _DropCheckOff;
public bool DropCheckOff
{
@@ -833,60 +849,67 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _CheckOffOnHLSOnly, "@CheckOffOnHLSOnly");
}
}
}
#endregion
#region RightCheckOffBox
[TypeConverter(typeof(ExpandableObjectConverter))]
public class RightCheckOffBox : vlnFormatItem, IVlnIndexedFormatItem
{
public RightCheckOffBox(XmlNode xmlNode) : base(xmlNode) { }
public RightCheckOffBox() : base() { }
private LazyLoad<int?> _Index;
public int? Index
{
get
{
return LazyLoad(ref _Index, "@Index");
}
}
private LazyLoad<int?> _RightCheckOffBoxChar;
public int? RightCheckOffBoxChar
{
get
{
return LazyLoad(ref _RightCheckOffBoxChar, "@RightCheckOffBoxChar");
}
}
public override string GetPDDisplayName()
{ return string.Format("[{0}]", Index); }
public override string GetPDDescription()
{ return string.Format("[{0}] - {1}", Index, RightCheckOffBoxChar); }
public override string GetPDCategory()
{ return "RightCheckOffBox Data"; }
public override string ToString()
{
return RightCheckOffBoxChar.ToString();
}
}
#endregion
#region RightCheckOffBoxList
[TypeConverter(typeof(vlnIndexedListConverter<RightCheckOffBoxList, RightCheckOffBox>))]
public class RightCheckOffBoxList : vlnIndexedFormatList<RightCheckOffBox>
{
public RightCheckOffBoxList(XmlNodeList xmlNodeList,IFormatOrFormatInfo myFormat) : base(xmlNodeList,myFormat) { }
public override vlnIndexedFormatList<RightCheckOffBox> InheritedList
private LazyLoad<bool> _SkipSpaces;
public bool SkipSpaces
{
get
{
IFormatOrFormatInfo parentFormat = MyFormat.MyIParent;
if (parentFormat != null)
return parentFormat.PlantFormat.FormatData.ProcData.CheckOffData.RightCheckOffBoxList;
return null;
return LazyLoad(ref _SkipSpaces, "@SkipSpaces");
}
}
}
#endregion
//#region RightCheckOffBox
//[TypeConverter(typeof(ExpandableObjectConverter))]
//public class RightCheckOffBox : vlnFormatItem, IVlnIndexedFormatItem
//{
// public RightCheckOffBox(XmlNode xmlNode) : base(xmlNode) { }
// public RightCheckOffBox() : base() { }
// private LazyLoad<int?> _Index;
// public int? Index
// {
// get
// {
// return LazyLoad(ref _Index, "@Index");
// }
// }
// private LazyLoad<int?> _RightCheckOffBoxChar;
// public int? RightCheckOffBoxChar
// {
// get
// {
// return LazyLoad(ref _RightCheckOffBoxChar, "@RightCheckOffBoxChar");
// }
// }
// public override string GetPDDisplayName()
// { return string.Format("[{0}]", Index); }
// public override string GetPDDescription()
// { return string.Format("[{0}] - {1}", Index, RightCheckOffBoxChar); }
// public override string GetPDCategory()
// { return "RightCheckOffBox Data"; }
// public override string ToString()
// {
// return RightCheckOffBoxChar.ToString();
// }
//}
//#endregion
//#region RightCheckOffBoxList
//[TypeConverter(typeof(vlnIndexedListConverter<RightCheckOffBoxList, RightCheckOffBox>))]
//public class RightCheckOffBoxList : vlnIndexedFormatList<RightCheckOffBox>
//{
// public RightCheckOffBoxList(XmlNodeList xmlNodeList,IFormatOrFormatInfo myFormat) : base(xmlNodeList,myFormat) { }
// public override vlnIndexedFormatList<RightCheckOffBox> InheritedList
// {
// get
// {
// IFormatOrFormatInfo parentFormat = MyFormat.MyIParent;
// if (parentFormat != null)
// return parentFormat.PlantFormat.FormatData.ProcData.CheckOffData.RightCheckOffBoxList;
// return null;
// }
// }
//}
//#endregion
#region CheckOff
[TypeConverter(typeof(ExpandableObjectConverter))]
public class CheckOff : vlnFormatItem,IVlnIndexedFormatItem
@@ -901,12 +924,12 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _Index, "@Index");
}
}
private LazyLoad<int?> _RightCheckOffChars;
public int? RightCheckOffChars
private LazyLoad<int?> _UIMark;
public int? UIMark
{
get
{
return LazyLoad(ref _RightCheckOffChars, "@RightCheckOffChars");
return LazyLoad(ref _UIMark, "@UIMark");
}
}
private LazyLoad<int?> _CheckOffWidAdjust;
@@ -917,23 +940,31 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _CheckOffWidAdjust, "@CheckOffWidAdjust");
}
}
private LazyLoad<string> _RightCheckOffPrompt;
public string RightCheckOffPrompt
private LazyLoad<string> _MenuItem;
public string MenuItem
{
get
{
return LazyLoad(ref _RightCheckOffPrompt, "@RightCheckOffPrompt");
{
return LazyLoad(ref _MenuItem, "@MenuItem");
}
}
private LazyLoad<string> _Macro;
public string Macro
{
get
{
return LazyLoad(ref _Macro, "@Macro");
}
}
public override string GetPDDisplayName()
{ return string.Format("[{0}]",Index); }
public override string GetPDDescription()
{ return string.Format("[{0}] - {1}", Index, RightCheckOffPrompt); }
{ return string.Format("[{0}] - {1}", Index, MenuItem); }
public override string GetPDCategory()
{ return "Checkoff Data"; }
public override string ToString()
{
return RightCheckOffPrompt;
return MenuItem;
}
}
#endregion
@@ -1019,6 +1050,14 @@ namespace VEPROMS.CSLA.Library
public class ChangeBarData : vlnFormatItem
{
public ChangeBarData(XmlNode xmlNode) : base(xmlNode) { }
private LazyLoad<string> _DefaultCBLoc;
public string DefaultCBLoc
{
get
{
return LazyLoad(ref _DefaultCBLoc, "@DefaultCBLoc");
}
}
private LazyLoad<string> _ChangeBarMessage;
public string ChangeBarMessage
{
@@ -3946,6 +3985,14 @@ namespace VEPROMS.CSLA.Library
: base(xmlNode)
{
}
private MacroList _MacroList;
public MacroList MacroList
{
get
{
return _MacroList == null ? _MacroList = new MacroList(SelectNodes("TabData/MacroList/Macro")) : _MacroList;
}
}
private LazyLoad<string> _IdentEdit;
public string IdentEdit
{
@@ -3994,14 +4041,14 @@ namespace VEPROMS.CSLA.Library
return LazyLoad(ref _Justify, "TabData/@Justify");
}
}
private LazyLoad<string> _CheckOff;
public string CheckOff
{
get
{
return LazyLoad(ref _CheckOff, "TabData/@CheckOff");
}
}
//private LazyLoad<string> _CheckOff;
//public string CheckOff
//{
// get
// {
// return LazyLoad(ref _CheckOff, "TabData/@CheckOff");
// }
//}
private LazyLoad<bool> _UsePreviousStyle;
public bool UsePreviousStyle
{
@@ -4019,8 +4066,91 @@ namespace VEPROMS.CSLA.Library
return (_Font == null ? _Font = new VE_Font(xn) : _Font);
}
}
}
#endregion
#region MacroList
[TypeConverter(typeof(vlnListConverter<MacroList, Macro>))]
public class MacroList : vlnNamedFormatList<Macro>
{
public MacroList(XmlNodeList xmlNodeList) : base(xmlNodeList, null) { }
public override vlnNamedFormatList<Macro> InheritedList
{
get
{
return null;
}
}
}
#endregion
#region Macro
[TypeConverter(typeof(ExpandableObjectConverter))]
public class Macro : vlnFormatItem, IVlnNamedFormatItem
{
public Macro(XmlNode xmlNode) : base(xmlNode) { }
public Macro() : base() { }
private LazyLoad<string> _Name;
public string Name
{
get
{
return LazyLoad(ref _Name, "@Name");
}
}
private LazyLoad<string> _MacroDef;
public string MacroDef
{
get
{
if (_Inherited == null) SetupStepInheritance();
return LazyLoad(ref _MacroDef, "@Macro");
}
}
private LazyLoad<int?> _Grouping;
public int? Grouping
{
get
{
if (_Inherited == null) SetupStepInheritance();
return LazyLoad(ref _Grouping, "@Grouping");
}
}
private LazyLoad<bool> _NotInRNO;
public bool NotInRNO
{
get
{
if (_Inherited == null) SetupStepInheritance();
return LazyLoad(ref _NotInRNO, "@NotInRNO");
}
}
private bool? _Inherited;
public bool Inherited
{
get
{
if (_Inherited == null) SetupStepInheritance();
return (bool) _Inherited;
}
}
private void SetupStepInheritance()
{
if (_Inherited != null) return;
LazyLoad<string> macroName = null;
_Inherited = (LazyLoad(ref macroName, "@Macro") == null);
// No MacroName, Find parent that has data
string path = string.Format("TabData/MacroList/Macro[@Name='{0}' and @Macro]", Name);
XmlNode xn = vlnFormatDocument.LookupSingleStepNode(XmlNode.ParentNode.ParentNode.ParentNode, path);
if (xn != null)
{
_MacroDef = new LazyLoad<string>(RetrieveString(xn.SelectSingleNode("@Macro")));
_Grouping = new LazyLoad<int?>(RetrieveInt("@Grouping" ,xn.SelectSingleNode("@Grouping")));
_NotInRNO = new LazyLoad<bool>(RetrieveBool( xn.SelectSingleNode("@NotInRNO")));
}
}
}
#endregion
#endregion
#region BoxDataAll
#region Box