Changeset 3280 for trunk/sources/HeuristicLab.Optimization.Views/3.3

Timestamp:

04/07/10 05:22:33 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• RunCollectionView.Designer.cs (modified) (1 diff)
• RunCollectionView.cs (modified) (17 diffs)
• RunView.Designer.cs (modified) (2 diffs)
• RunView.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs

@@ -38 +38 @@
       if (disposing) {
         foreach (ListViewItem item in itemsListView.Items)
-          ((Run)item.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
+          ((IRun)item.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
         if (components != null) components.Dispose();
       }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -31 +31 @@
   [View("RunCollection View")]
   [Content(typeof(RunCollection), true)]
-  [Content(typeof(IObservableCollection<Run>), false)]
+  [Content(typeof(IObservableCollection<IRun>), false)]
   public partial class RunCollectionView : AsynchronousContentView {
-    public new IObservableCollection<Run> Content {
-      get { return (IObservableCollection<Run>)base.Content; }
+    public new IObservableCollection<IRun> Content {
+      get { return (IObservableCollection<IRun>)base.Content; }
       set { base.Content = value; }
     }
@@ -47 +47 @@
     }
 
-    public RunCollectionView(IObservableCollection<Run> content)
+    public RunCollectionView(IObservableCollection<IRun> content)
       : this() {
       Content = content;
@@ -53 +53 @@
 
     protected override void DeregisterContentEvents() {
-      Content.ItemsAdded -= new CollectionItemsChangedEventHandler<Run>(Content_ItemsAdded);
-      Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<Run>(Content_ItemsRemoved);
-      Content.CollectionReset -= new CollectionItemsChangedEventHandler<Run>(Content_CollectionReset);
+      Content.ItemsAdded -= new CollectionItemsChangedEventHandler<IRun>(Content_ItemsAdded);
+      Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved);
+      Content.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
       base.DeregisterContentEvents();
     }
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.ItemsAdded += new CollectionItemsChangedEventHandler<Run>(Content_ItemsAdded);
-      Content.ItemsRemoved += new CollectionItemsChangedEventHandler<Run>(Content_ItemsRemoved);
-      Content.CollectionReset += new CollectionItemsChangedEventHandler<Run>(Content_CollectionReset);
+      Content.ItemsAdded += new CollectionItemsChangedEventHandler<IRun>(Content_ItemsAdded);
+      Content.ItemsRemoved += new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved);
+      Content.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
     }
 
@@ -77 +77 @@
         Caption += " (" + Content.GetType().Name + ")";
         itemsListView.Enabled = true;
-        foreach (Run item in Content)
+        foreach (IRun item in Content)
           AddListViewItem(CreateListViewItem(item));
       }
     }
 
-    protected virtual ListViewItem CreateListViewItem(Run item) {
+    protected virtual ListViewItem CreateListViewItem(IRun item) {
       if (!itemsListView.SmallImageList.Images.ContainsKey(item.GetType().FullName))
         itemsListView.SmallImageList.Images.Add(item.GetType().FullName, item.ItemImage);
@@ -95 +95 @@
     protected virtual void AddListViewItem(ListViewItem listViewItem) {
       itemsListView.Items.Add(listViewItem);
-      ((Run)listViewItem.Tag).ToStringChanged += new EventHandler(Item_ToStringChanged);
+      ((IRun)listViewItem.Tag).ToStringChanged += new EventHandler(Item_ToStringChanged);
     }
     protected virtual void RemoveListViewItem(ListViewItem listViewItem) {
-      ((Run)listViewItem.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
+      ((IRun)listViewItem.Tag).ToStringChanged -= new EventHandler(Item_ToStringChanged);
       listViewItem.Remove();
     }
@@ -106 +106 @@
       }
     }
-    protected virtual IEnumerable<ListViewItem> GetListViewItemsForItem(Run item) {
+    protected virtual IEnumerable<ListViewItem> GetListViewItemsForItem(IRun item) {
       foreach (ListViewItem listViewItem in itemsListView.Items) {
-        if (((Run)listViewItem.Tag) == item)
+        if (((IRun)listViewItem.Tag) == item)
           yield return listViewItem;
       }
@@ -117 +117 @@
       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && !Content.IsReadOnly;
       if (itemsListView.SelectedItems.Count == 1) {
-        Run item = (Run)itemsListView.SelectedItems[0].Tag;
+        IRun item = (IRun)itemsListView.SelectedItems[0].Tag;
         detailsGroupBox.Enabled = true;
         viewHost.ViewType = null;
@@ -134 +134 @@
         if ((itemsListView.SelectedItems.Count > 0) && !Content.IsReadOnly) {
           foreach (ListViewItem item in itemsListView.SelectedItems)
-            Content.Remove((Run)item.Tag);
+            Content.Remove((IRun)item.Tag);
         }
       }
@@ -140 +140 @@
     protected virtual void itemsListView_DoubleClick(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count == 1) {
-        Run item = (Run)itemsListView.SelectedItems[0].Tag;
+        IRun item = (IRun)itemsListView.SelectedItems[0].Tag;
         IView view = MainFormManager.CreateDefaultView(item);
         if (view != null) view.Show();
@@ -147 +147 @@
     protected virtual void itemsListView_ItemDrag(object sender, ItemDragEventArgs e) {
       ListViewItem listViewItem = (ListViewItem)e.Item;
-      Run item = (Run)listViewItem.Tag;
+      IRun item = (IRun)listViewItem.Tag;
       DataObject data = new DataObject();
       data.SetData("Type", item.GetType());
@@ -162 +162 @@
       e.Effect = DragDropEffects.None;
       Type type = e.Data.GetData("Type") as Type;
-      if ((!Content.IsReadOnly) && (type != null) && (typeof(Run).IsAssignableFrom(type))) {
+      if ((!Content.IsReadOnly) && (type != null) && (typeof(IRun).IsAssignableFrom(type))) {
         if ((e.KeyState & 8) == 8) e.Effect = DragDropEffects.Copy;  // CTRL key
         else if ((e.KeyState & 4) == 4) e.Effect = DragDropEffects.Move;  // SHIFT key
@@ -172 +172 @@
     protected virtual void itemsListView_DragDrop(object sender, DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        Run item = e.Data.GetData("Value") as Run;
-        if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) item = (Run)item.Clone();
+        IRun item = e.Data.GetData("Value") as IRun;
+        if ((e.Effect & DragDropEffects.Copy) == DragDropEffects.Copy) item = (IRun)item.Clone();
         Content.Add(item);
       }
@@ -183 +183 @@
       if (itemsListView.SelectedItems.Count > 0) {
         foreach (ListViewItem item in itemsListView.SelectedItems)
-          Content.Remove((Run)item.Tag);
+          Content.Remove((IRun)item.Tag);
         itemsListView.SelectedItems.Clear();
       }
@@ -190 +190 @@
 
     #region Content Events
-    protected virtual void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<Run> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<Run>(Content_ItemsAdded), sender, e);
+    protected virtual void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_ItemsAdded), sender, e);
       else
-        foreach (Run item in e.Items)
+        foreach (IRun item in e.Items)
           AddListViewItem(CreateListViewItem(item));
     }
-    protected virtual void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<Run> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<Run>(Content_ItemsRemoved), sender, e);
+    protected virtual void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved), sender, e);
       else {
-        foreach (Run item in e.Items) {
+        foreach (IRun item in e.Items) {
           foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
             RemoveListViewItem(listViewItem);
@@ -209 +209 @@
       }
     }
-    protected virtual void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<Run> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<Run>(Content_CollectionReset), sender, e);
+    protected virtual void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset), sender, e);
       else {
-        foreach (Run item in e.OldItems) {
+        foreach (IRun item in e.OldItems) {
           foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
             RemoveListViewItem(listViewItem);
@@ -219 +219 @@
           }
         }
-        foreach (Run item in e.Items)
+        foreach (IRun item in e.Items)
           AddListViewItem(CreateListViewItem(item));
       }
@@ -230 +230 @@
         Invoke(new EventHandler(Item_ToStringChanged), sender, e);
       else {
-        Run item = (Run)sender;
+        IRun item = (IRun)sender;
         foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
           UpdateListViewItem(listViewItem);

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.Windows.Forms.ListViewGroup listViewGroup1 = new System.Windows.Forms.ListViewGroup("Parameters", System.Windows.Forms.HorizontalAlignment.Left);
-      System.Windows.Forms.ListViewGroup listViewGroup2 = new System.Windows.Forms.ListViewGroup("Results", System.Windows.Forms.HorizontalAlignment.Left);
+      System.Windows.Forms.ListViewGroup listViewGroup1 = new System.Windows.Forms.ListViewGroup("Results", System.Windows.Forms.HorizontalAlignment.Left);
+      System.Windows.Forms.ListViewGroup listViewGroup2 = new System.Windows.Forms.ListViewGroup("Parameters", System.Windows.Forms.HorizontalAlignment.Left);
       this.parametersResultsGroupBox = new System.Windows.Forms.GroupBox();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
@@ -113 +113 @@
             this.valueColumnHeader});
       this.listView.FullRowSelect = true;
-      listViewGroup1.Header = "Parameters";
-      listViewGroup1.Name = "parametersGroup";
-      listViewGroup2.Header = "Results";
-      listViewGroup2.Name = "resultsGroup";
+      listViewGroup1.Header = "Results";
+      listViewGroup1.Name = "resultsGroup";
+      listViewGroup2.Header = "Parameters";
+      listViewGroup2.Name = "parametersGroup";
       this.listView.Groups.AddRange(new System.Windows.Forms.ListViewGroup[] {
             listViewGroup1,

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunView.cs

@@ -31 +31 @@
   /// </summary>
   [View("Run View")]
-  [Content(typeof(Run), true)]
+  [Content(typeof(IRun), true)]
   public sealed partial class RunView : NamedItemView {
     /// <summary>
@@ -38 +38 @@
     /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
     /// No own data storage present.</remarks>
-    public new Run Content {
-      get { return (Run)base.Content; }
+    public new IRun Content {
+      get { return (IRun)base.Content; }
       set { base.Content = value; }
     }
@@ -55 +55 @@
     /// <remarks>Calls <see cref="VariableView()"/>.</remarks>
     /// <param name="variable">The variable to represent visually.</param>
-    public RunView(Run content)
+    public RunView(IRun content)
       : this() {
       Content = content;
@@ -76 +76 @@
     private void FillListView() {
       if (!listView.SmallImageList.Images.ContainsKey("Default"))
-        listView.SmallImageList.Images.Add("Default", HeuristicLab.Common.Resources.VS2008ImageLibrary.Class);
+        listView.SmallImageList.Images.Add("Default", HeuristicLab.Common.Resources.VS2008ImageLibrary.Nothing);
 
       listView.Items.Clear();