Changeset 3829 for trunk/sources

Timestamp:

05/18/10 02:03:24 (15 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/CreateParameterDialog.Designer.cs (modified) (13 diffs)
• HeuristicLab.Core.Views/3.3/CreateParameterDialog.cs (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/CreateParameterDialog.Designer.cs

@@ -33 +33 @@
     protected override void Dispose(bool disposing) {
       if (disposing) {
-        if (typeSelectorDialog != null) typeSelectorDialog.Dispose();
         if (components != null) components.Dispose();
       }
@@ -46 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
       this.cancelButton = new System.Windows.Forms.Button();
       this.okButton = new System.Windows.Forms.Button();
@@ -53 +51 @@
       this.descriptionLabel = new System.Windows.Forms.Label();
       this.descriptionTextBox = new System.Windows.Forms.TextBox();
-      this.dataTypeLabel = new System.Windows.Forms.Label();
-      this.dataTypeTextBox = new System.Windows.Forms.TextBox();
-      this.setDataTypeButton = new System.Windows.Forms.Button();
       this.parameterTypeSelector = new HeuristicLab.Core.Views.TypeSelector();
-      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.SuspendLayout();
       // 
@@ -64 +58 @@
       this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-      this.cancelButton.Location = new System.Drawing.Point(455, 450);
+      this.cancelButton.Location = new System.Drawing.Point(455, 527);
       this.cancelButton.Name = "cancelButton";
       this.cancelButton.Size = new System.Drawing.Size(75, 23);
-      this.cancelButton.TabIndex = 9;
+      this.cancelButton.TabIndex = 6;
       this.cancelButton.Text = "&Cancel";
       this.cancelButton.UseVisualStyleBackColor = true;
@@ -76 +70 @@
       this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
       this.okButton.Enabled = false;
-      this.okButton.Location = new System.Drawing.Point(374, 450);
+      this.okButton.Location = new System.Drawing.Point(374, 527);
       this.okButton.Name = "okButton";
       this.okButton.Size = new System.Drawing.Size(75, 23);
-      this.okButton.TabIndex = 8;
+      this.okButton.TabIndex = 5;
       this.okButton.Text = "&OK";
       this.okButton.UseVisualStyleBackColor = true;
@@ -87 +81 @@
       this.nameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.nameLabel.AutoSize = true;
-      this.nameLabel.Location = new System.Drawing.Point(9, 289);
+      this.nameLabel.Location = new System.Drawing.Point(9, 396);
       this.nameLabel.Name = "nameLabel";
       this.nameLabel.Size = new System.Drawing.Size(38, 13);
@@ -97 +91 @@
       this.nameTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.nameTextBox.Location = new System.Drawing.Point(78, 286);
+      this.nameTextBox.Location = new System.Drawing.Point(78, 393);
       this.nameTextBox.Name = "nameTextBox";
       this.nameTextBox.Size = new System.Drawing.Size(452, 20);
@@ -106 +100 @@
       this.descriptionLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.descriptionLabel.AutoSize = true;
-      this.descriptionLabel.Location = new System.Drawing.Point(9, 315);
+      this.descriptionLabel.Location = new System.Drawing.Point(9, 422);
       this.descriptionLabel.Name = "descriptionLabel";
       this.descriptionLabel.Size = new System.Drawing.Size(63, 13);
@@ -116 +110 @@
       this.descriptionTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.descriptionTextBox.Location = new System.Drawing.Point(78, 312);
+      this.descriptionTextBox.Location = new System.Drawing.Point(78, 419);
       this.descriptionTextBox.Multiline = true;
       this.descriptionTextBox.Name = "descriptionTextBox";
@@ -122 +116 @@
       this.descriptionTextBox.Size = new System.Drawing.Size(452, 102);
       this.descriptionTextBox.TabIndex = 4;
-      // 
-      // dataTypeLabel
-      // 
-      this.dataTypeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.dataTypeLabel.AutoSize = true;
-      this.dataTypeLabel.Location = new System.Drawing.Point(12, 425);
-      this.dataTypeLabel.Name = "dataTypeLabel";
-      this.dataTypeLabel.Size = new System.Drawing.Size(60, 13);
-      this.dataTypeLabel.TabIndex = 5;
-      this.dataTypeLabel.Text = "Data &Type:";
-      // 
-      // dataTypeTextBox
-      // 
-      this.dataTypeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.dataTypeTextBox.Enabled = false;
-      this.dataTypeTextBox.Location = new System.Drawing.Point(78, 422);
-      this.dataTypeTextBox.Name = "dataTypeTextBox";
-      this.dataTypeTextBox.ReadOnly = true;
-      this.dataTypeTextBox.Size = new System.Drawing.Size(422, 20);
-      this.dataTypeTextBox.TabIndex = 6;
-      // 
-      // setDataTypeButton
-      // 
-      this.setDataTypeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.setDataTypeButton.Enabled = false;
-      this.setDataTypeButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Edit;
-      this.setDataTypeButton.Location = new System.Drawing.Point(506, 420);
-      this.setDataTypeButton.Name = "setDataTypeButton";
-      this.setDataTypeButton.Size = new System.Drawing.Size(24, 24);
-      this.setDataTypeButton.TabIndex = 7;
-      this.toolTip.SetToolTip(this.setDataTypeButton, "Set Data Type");
-      this.setDataTypeButton.UseVisualStyleBackColor = true;
-      this.setDataTypeButton.Click += new System.EventHandler(this.setDataTypeButton_Click);
       // 
       // parameterTypeSelector
@@ -165 +125 @@
       this.parameterTypeSelector.Location = new System.Drawing.Point(12, 12);
       this.parameterTypeSelector.Name = "parameterTypeSelector";
-      this.parameterTypeSelector.Size = new System.Drawing.Size(518, 268);
+      this.parameterTypeSelector.Size = new System.Drawing.Size(518, 375);
       this.parameterTypeSelector.TabIndex = 0;
       this.parameterTypeSelector.SelectedTypeChanged += new System.EventHandler(this.parameterTypeSelector_SelectedTypeChanged);
@@ -175 +135 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.CancelButton = this.cancelButton;
-      this.ClientSize = new System.Drawing.Size(542, 485);
-      this.Controls.Add(this.setDataTypeButton);
+      this.ClientSize = new System.Drawing.Size(542, 562);
       this.Controls.Add(this.parameterTypeSelector);
       this.Controls.Add(this.descriptionTextBox);
-      this.Controls.Add(this.dataTypeTextBox);
       this.Controls.Add(this.nameTextBox);
-      this.Controls.Add(this.dataTypeLabel);
       this.Controls.Add(this.descriptionLabel);
       this.Controls.Add(this.nameLabel);
@@ -207 +164 @@
     protected System.Windows.Forms.TextBox descriptionTextBox;
     protected TypeSelector parameterTypeSelector;
-    protected System.Windows.Forms.Label dataTypeLabel;
-    protected System.Windows.Forms.TextBox dataTypeTextBox;
-    protected System.Windows.Forms.Button setDataTypeButton;
-    protected System.Windows.Forms.ToolTip toolTip;
   }
 }

trunk/sources/HeuristicLab.Core.Views/3.3/CreateParameterDialog.cs

@@ -26 +26 @@
 namespace HeuristicLab.Core.Views {
   public partial class CreateParameterDialog : Form {
-    protected TypeSelectorDialog typeSelectorDialog;
-
     public TypeSelector ParameterTypeSelector {
       get { return parameterTypeSelector; }
@@ -34 +32 @@
       get {
         try {
-          Type type = parameterTypeSelector.SelectedType;
-          if (type.ContainsGenericParameters) {
-            type = type.MakeGenericType((Type)dataTypeTextBox.Tag);
-          }
-          return (IParameter)Activator.CreateInstance(type, nameTextBox.Text, descriptionTextBox.Text);
+          return (IParameter)Activator.CreateInstance(parameterTypeSelector.SelectedType, nameTextBox.Text, descriptionTextBox.Text);
         }
         catch (Exception ex) {
@@ -55 +49 @@
     }
 
-    protected virtual void setDataTypeButton_Click(object sender, EventArgs e) {
-      if (typeSelectorDialog == null) {
-        typeSelectorDialog = new TypeSelectorDialog();
-        typeSelectorDialog.Caption = "Select Data Type";
-        typeSelectorDialog.TypeSelector.Configure(typeof(IItem), true, true);
-      }
-
-      if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
-        dataTypeTextBox.Text = typeSelectorDialog.TypeSelector.SelectedType.FullName;
-        dataTypeTextBox.Tag = typeSelectorDialog.TypeSelector.SelectedType;
-      }
-      okButton.Enabled = dataTypeTextBox.Tag != null;
-    }
-
     protected virtual void parameterTypeSelector_SelectedTypeChanged(object sender, EventArgs e) {
-      dataTypeTextBox.Text = "-";
-      dataTypeTextBox.Tag = null;
-      dataTypeTextBox.Enabled = false;
-      setDataTypeButton.Enabled = false;
-      okButton.Enabled = false;
-
-      if (parameterTypeSelector.SelectedType != null) {
-        if (parameterTypeSelector.SelectedType.ContainsGenericParameters) {
-          dataTypeTextBox.Enabled = true;
-          setDataTypeButton.Enabled = true;
-        } else {
-          okButton.Enabled = true;
-        }
-      }
+      okButton.Enabled = (parameterTypeSelector.SelectedType != null) && !parameterTypeSelector.SelectedType.ContainsGenericParameters;
     }
   }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -205 +205 @@
                                (Content != null) && !Content.IsReadOnly && !ReadOnly;
       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && (Content != null) && !Content.IsReadOnly && !ReadOnly;
+      AdjustListViewColumnSizes();
 
       if (itemsListView.SelectedItems.Count == 1) {
@@ -391 +392 @@
             UpdateListViewItemText(listViewItem);
         }
-        AdjustListViewColumnSizes();
       }
     }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -163 +163 @@
     protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
       removeButton.Enabled = (Content != null) && !Content.IsReadOnly && !ReadOnly && itemsListView.SelectedItems.Count > 0;
+      AdjustListViewColumnSizes();
       if (itemsListView.SelectedItems.Count == 1) {
         T item = (T)itemsListView.SelectedItems[0].Tag;
@@ -300 +301 @@
         foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
           UpdateListViewItemText(listViewItem);
-        AdjustListViewColumnSizes();
       }
     }

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -199 +199 @@
       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 &&
                              (Content != null) && !Content.IsReadOnly && !ReadOnly;
+      AdjustListViewColumnSizes();
 
       if (itemsListView.SelectedItems.Count == 1) {
@@ -392 +393 @@
             UpdateListViewItemText(listViewItem);
         }
-        AdjustListViewColumnSizes();
       }
     }

trunk/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs

@@ -123 +123 @@
               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)) {
+              else if (typeof(IItem).IsAssignableFrom(type) && !type.IsInterface && !type.IsAbstract) {
                 try {
                   IItem item = (IItem)Activator.CreateInstance(type);

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

@@ -146 +146 @@
       this.itemsListView.View = System.Windows.Forms.View.Details;
       this.itemsListView.SelectedIndexChanged += new System.EventHandler(this.itemsListView_SelectedIndexChanged);
-      this.itemsListView.SizeChanged += new System.EventHandler(this.itemsListView_SizeChanged);
       this.itemsListView.DoubleClick += new System.EventHandler(this.itemsListView_DoubleClick);
       this.itemsListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.itemsListView_DragDrop);

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

@@ -161 +161 @@
       ((IRun)listViewItem.Tag).ItemImageChanged += new EventHandler(Item_ItemImageChanged);
       ((IRun)listViewItem.Tag).ToStringChanged += new EventHandler(Item_ToStringChanged);
+      AdjustListViewColumnSizes();
     }
     protected virtual void RemoveListViewItem(ListViewItem listViewItem) {
@@ -190 +191 @@
     protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && (Content != null) && !Content.IsReadOnly && !ReadOnly;
+      AdjustListViewColumnSizes();
       if (itemsListView.SelectedItems.Count == 1) {
         IRun item = (IRun)itemsListView.SelectedItems[0].Tag;
@@ -198 +200 @@
         detailsGroupBox.Enabled = false;
       }
-    }
-    protected virtual void itemsListView_SizeChanged(object sender, EventArgs e) {
-      if (itemsListView.Columns.Count > 0)
-        itemsListView.Columns[0].Width = Math.Max(0, itemsListView.Width - 25);
     }
     protected virtual void itemsListView_KeyDown(object sender, KeyEventArgs e) {
@@ -346 +344 @@
         foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
           UpdateListViewItemText(listViewItem);
+        AdjustListViewColumnSizes();
       }
     }
@@ -370 +369 @@
     #endregion
 
+    #region Helpers
+    protected virtual void AdjustListViewColumnSizes() {
+      if (itemsListView.Items.Count > 0) {
+        for (int i = 0; i < itemsListView.Columns.Count; i++) {
+          itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        }
+      }
+    }
+    #endregion
   }
 }