diff --git a/PROMS/Volian.Controls.Library/DisplayPanel.cs b/PROMS/Volian.Controls.Library/DisplayPanel.cs index 5dfecf9e..8a6b0ea4 100644 --- a/PROMS/Volian.Controls.Library/DisplayPanel.cs +++ b/PROMS/Volian.Controls.Library/DisplayPanel.cs @@ -120,7 +120,7 @@ namespace Volian.Controls.Library { if (ctrl.GetType().Name == "DisplayItem") { - DisplayItem rtb = (DisplayItem)ctrl; + StepItem rtb = (StepItem)ctrl; rtb.BackColor = BackColor; } } @@ -143,16 +143,16 @@ namespace Volian.Controls.Library //this.Scroll += new ScrollEventHandler(DisplayPanel_Scroll); //// TIMING: DisplayItem.TimeIt("pMyItem Scroll"); Controls.Clear(); - ItemLookup = new Dictionary(); + ItemLookup = new Dictionary(); //// TIMING: DisplayItem.TimeIt("pMyItem Clear"); //SuspendLayout(); - DisplayItem vlnRTF = new DisplayItem(_MyItem, this, null, ChildRelation.None, false); + StepItem vlnRTF = new StepItem(_MyItem, this, null, ChildRelation.None, false); //ResumeLayout(); //// TIMING: DisplayItem.TimeIt("pMyItem End"); } } - internal Dictionary _ItemLookup; - public Dictionary ItemLookup + internal Dictionary _ItemLookup; + public Dictionary ItemLookup { get { return _ItemLookup; } set { _ItemLookup = value; } @@ -208,13 +208,13 @@ namespace Volian.Controls.Library _ItemSelected = value; int id = value.ItemID; ExpandAsNeeded(value); - DisplayItem itm = ItemLookup[id]; + StepItem itm = ItemLookup[id]; itm.ItemSelect(); OnItemSelectedChanged(this, new DisplayPanelEventArgs(itm, null)); //vlnStackTrace.ShowStack("_ItemSelected = {0}", _ItemSelected.ItemID);// Show StackTrace } } - public DisplayItem DisplayItemSelected + public StepItem DisplayItemSelected { get { return (_ItemSelected != null) ? ItemLookup[_ItemSelected.ItemID] : null; } } @@ -369,8 +369,8 @@ namespace Volian.Controls.Library foreach (Control control in Controls) if (control.GetType().Name == "DisplayItem") { - DisplayItem rtb = (DisplayItem)control; - DisplayItem nxt = rtb.NextItem; + StepItem rtb = (StepItem)control; + StepItem nxt = rtb.NextItem; if(_MyLog.IsInfoEnabled)_MyLog.InfoFormat("{0},{1}", rtb.MyID, nxt == null ? 0 : nxt.MyID); } } @@ -534,8 +534,8 @@ namespace Volian.Controls.Library } public partial class DisplayPanelEventArgs { - private DisplayItem _MyDisplayItem; // Volian Property Snippet - public DisplayItem MyDisplayItem + private StepItem _MyDisplayItem; // Volian Property Snippet + public StepItem MyDisplayItem { get { return _MyDisplayItem; } set { _MyDisplayItem = value; } @@ -547,7 +547,7 @@ namespace Volian.Controls.Library set { _MyMouseEventArgs = value; } } - public DisplayPanelEventArgs(DisplayItem myDisplayItem, MouseEventArgs myMouseEventArgs) + public DisplayPanelEventArgs(StepItem myDisplayItem, MouseEventArgs myMouseEventArgs) { _MyDisplayItem = myDisplayItem; _MyMouseEventArgs = myMouseEventArgs; @@ -555,13 +555,13 @@ namespace Volian.Controls.Library } public partial class DisplayPanelAttachmentEventArgs { - private DisplayItem _MyDisplayItem; // Volian Property Snippet - public DisplayItem MyDisplayItem + private StepItem _MyDisplayItem; // Volian Property Snippet + public StepItem MyDisplayItem { get { return _MyDisplayItem; } set { _MyDisplayItem = value; } } - public DisplayPanelAttachmentEventArgs(DisplayItem myDisplayItem) + public DisplayPanelAttachmentEventArgs(StepItem myDisplayItem) { _MyDisplayItem = myDisplayItem; } @@ -569,8 +569,8 @@ namespace Volian.Controls.Library public partial class DisplayLinkEventArgs : EventArgs { private static readonly log4net.ILog _MyLog = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); - private DisplayItem _LinkedRTB; // Volian Property Snippet - public DisplayItem LinkedRTB + private StepItem _LinkedRTB; // Volian Property Snippet + public StepItem LinkedRTB { get { return _LinkedRTB; } set { _LinkedRTB = value; } @@ -581,7 +581,7 @@ namespace Volian.Controls.Library get { return _LinkInfo; } set { _LinkInfo = value; } } - public DisplayLinkEventArgs(DisplayItem linkedRTB, LinkClickedEventArgs linkInfo) + public DisplayLinkEventArgs(StepItem linkedRTB, LinkClickedEventArgs linkInfo) { LinkedRTB = linkedRTB; LinkInfo = linkInfo;