Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Core.Views/3.3

Timestamp:

12/20/11 11:45:18 (12 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/CheckedItemListView.cs (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (2 diffs, 1 prop)

branches/HeuristicLab.TimeSeries/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using System.Drawing;
 using System.Windows.Forms;
@@ -54 +55 @@
     private Color backupColor = Color.Empty;
     protected override void SetEnabledStateOfControls() {
-      if(backupColor == Color.Empty) backupColor = base.itemsListView.BackColor;
+      if (backupColor == Color.Empty) backupColor = base.itemsListView.BackColor;
       base.SetEnabledStateOfControls();
       if (ReadOnly || Locked)
@@ -88 +89 @@
         doubleClick = true;
     }
+
+    protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
+      validDragOperation = false;
+      if (Locked || ReadOnly) return;
+
+      var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>;
+      if (data != null)
+        validDragOperation = Content.Select(x => x.ToString()).SequenceEqual(data.Select(x => x.ToString()));
+      else
+        base.itemsListView_DragEnter(sender, e);
+    }
+
+    protected override void itemsListView_DragOver(object sender, DragEventArgs e) {
+      e.Effect = DragDropEffects.None;
+      if (!validDragOperation) return;
+
+      var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>;
+      if (data != null)
+        e.Effect = DragDropEffects.Copy;
+      else
+        base.itemsListView_DragOver(sender, e);
+    }
+
+    protected override void itemsListView_DragDrop(object sender, DragEventArgs e) {
+      if (e.Effect == DragDropEffects.None) return;
+      var data = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) as ICheckedItemList<T>;
+      if (data != null) {
+        for (int i = 0; i < Content.Count; i++) {
+          Content.SetItemCheckedState(Content[i], data.ItemChecked(data[i]));
+        }
+      } else
+        base.itemsListView_DragDrop(sender, e);
+    }
     #endregion
 

branches/HeuristicLab.TimeSeries/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -400 +400 @@
         foreach (IndexedItem<T> item in e.Items) {
           ListViewItem listViewItem = itemsListView.Items[item.Index];
+          if (listViewItem.Tag != null)
+            itemListViewItemMapping[(T)listViewItem.Tag].Remove(listViewItem);
           listViewItem.Tag = item.Value;
+          if (listViewItem.Tag != null)
+            itemListViewItemMapping[item.Value].Add(listViewItem);
           UpdateListViewItemImage(listViewItem);
           UpdateListViewItemText(listViewItem);

branches/HeuristicLab.TimeSeries/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -441 +441 @@
         foreach (IndexedItem<T> item in e.Items) {
           ListViewItem listViewItem = itemsListView.Items[item.Index];
+          if (listViewItem.Tag != null)
+            itemListViewItemMapping[(T)listViewItem.Tag].Remove(listViewItem);
           listViewItem.Tag = item.Value;
+          if (listViewItem.Tag != null)
+            itemListViewItemMapping[item.Value].Add(listViewItem);
           UpdateListViewItemImage(listViewItem);
           UpdateListViewItemText(listViewItem);

branches/HeuristicLab.TimeSeries/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -128 +128 @@
           pluginNode.Tag = plugin;
 
-          var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, !ShowNotInstantiableTypes, assignableToAllTypes)
+          var types = from t in ApplicationManager.Manager.GetTypes(BaseTypes, plugin, !ShowNotInstantiableTypes, ShowGenericTypes, assignableToAllTypes)
                       where typeCondition(t)
                       orderby t.Name ascending
                       select t;
           foreach (Type type in types) {
-            bool valid = true;
-            valid = valid && (ShowGenericTypes || !type.ContainsGenericParameters);
-            valid = valid && (ShowNotInstantiableTypes || type.GetConstructor(Type.EmptyTypes) != null); //check for public default ctor
+            bool valid = (ShowNotInstantiableTypes || type.GetConstructor(Type.EmptyTypes) != null); //check for public default ctor
             if (valid) {
               TreeNode typeNode = new TreeNode();
@@ -144 +142 @@
               else if (type.ContainsGenericParameters) typeNode.ImageIndex = 3;
               else if (imageList.Images.ContainsKey(type.FullName)) typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
-              else if (typeof(IItem).IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract && type.GetConstructor(Type.EmptyTypes) != null) {
-                IItem item = (IItem)Activator.CreateInstance(type);
-                imageList.Images.Add(type.FullName, item.ItemImage);
-                typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
+              else {
+                var image = ItemAttribute.GetImage(type);
+                if (image != null) {
+                  imageList.Images.Add(type.FullName, image);
+                  typeNode.ImageIndex = imageList.Images.IndexOfKey(type.FullName);
+                }
               }
               typeNode.SelectedImageIndex = typeNode.ImageIndex;