Changeset 8196 for trunk/sources/HeuristicLab.Problems.Instances.Views

Timestamp:

07/03/12 14:21:02 (12 years ago)

Author:

sforsten

Message:

#1782:

• removed loadButton
• a new problem instance is loaded as soon as it is selected in the combobox

Location:

trunk/sources/HeuristicLab.Problems.Instances.Views/3.3

Files:

• ProblemInstanceProviderViewGeneric.Designer.cs (modified) (5 diffs)
• ProblemInstanceProviderViewGeneric.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.Instances.Views/3.3/ProblemInstanceProviderViewGeneric.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      this.loadButton = new System.Windows.Forms.Button();
       this.instanceLabel = new System.Windows.Forms.Label();
       this.instancesComboBox = new System.Windows.Forms.ComboBox();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-      this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
       this.SuspendLayout();
-      // 
-      // loadButton
-      // 
-      this.loadButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.loadButton.Location = new System.Drawing.Point(667, -1);
-      this.loadButton.Name = "loadButton";
-      this.loadButton.Size = new System.Drawing.Size(24, 24);
-      this.loadButton.TabIndex = 6;
-      this.loadButton.Text = "Load";
-      this.loadButton.UseVisualStyleBackColor = true;
-      this.loadButton.Click += new System.EventHandler(this.loadButton_Click);
       // 
       // instanceLabel
@@ -76 +63 @@
       // instancesComboBox
       // 
-      this.instancesComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.instancesComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.instancesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -82 +69 @@
       this.instancesComboBox.Location = new System.Drawing.Point(60, 1);
       this.instancesComboBox.Name = "instancesComboBox";
-      this.instancesComboBox.Size = new System.Drawing.Size(601, 21);
+      this.instancesComboBox.Size = new System.Drawing.Size(632, 21);
       this.instancesComboBox.TabIndex = 7;
       this.instancesComboBox.DataSourceChanged += new System.EventHandler(this.instancesComboBox_DataSourceChanged);
-      this.instancesComboBox.SelectedIndexChanged += new System.EventHandler(this.instancesComboBox_SelectedIndexChanged);
+      this.instancesComboBox.SelectionChangeCommitted += new System.EventHandler(instancesComboBox_SelectionChangeCommitted);
       // 
       // openFileDialog
@@ -102 +89 @@
       this.Controls.Add(this.instanceLabel);
       this.Controls.Add(this.instancesComboBox);
-      this.Controls.Add(this.loadButton);
       this.Name = "ProblemInstanceProviderViewGeneric";
       this.Size = new System.Drawing.Size(694, 21);
@@ -109 +95 @@
 
     }
-
     #endregion
 
     protected System.Windows.Forms.OpenFileDialog openFileDialog;
-    protected System.Windows.Forms.ToolTip toolTip;
-    protected System.Windows.Forms.Button loadButton;
     protected System.Windows.Forms.Label instanceLabel;
     protected System.Windows.Forms.ComboBox instancesComboBox;

trunk/sources/HeuristicLab.Problems.Instances.Views/3.3/ProblemInstanceProviderViewGeneric.cs

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -51 +50 @@
     public ProblemInstanceProviderViewGeneric() {
       InitializeComponent();
-      loadButton.Text = String.Empty;
-      loadButton.Image = VSImageLibrary.RefreshDocument;
-      toolTip.SetToolTip(loadButton, "Load the selected problem.");
     }
 
@@ -73 +69 @@
         instanceLabel.Show();
         instancesComboBox.Show();
-        loadButton.Show();
       } else {
         instanceLabel.Hide();
         instancesComboBox.Hide();
-        loadButton.Hide();
       }
     }
@@ -84 +78 @@
       base.SetEnabledStateOfControls();
       instancesComboBox.Enabled = !ReadOnly && !Locked && Content != null && GenericConsumer != null;
-      loadButton.Enabled = !ReadOnly && !Locked && Content != null && GenericConsumer != null && instancesComboBox.SelectedIndex >= 0;
-    }
-
-    protected virtual void loadButton_Click(object sender, EventArgs e) {
-      var descriptor = (IDataDescriptor)instancesComboBox.SelectedItem;
-      T instance = Content.LoadData(descriptor);
-      try {
-        GenericConsumer.Load(instance);
-      }
-      catch (Exception ex) {
-        MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", descriptor.Name, Environment.NewLine + ex.Message), "Cannot load instance");
-      }
     }
 
@@ -104 +86 @@
     }
 
-    private void instancesComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
-      SetEnabledStateOfControls();
+    private void instancesComboBox_SelectionChangeCommitted(object sender, System.EventArgs e) {
+      if (instancesComboBox.SelectedIndex >= 0) {
+        var descriptor = (IDataDescriptor)instancesComboBox.SelectedItem;
+        T instance = Content.LoadData(descriptor);
+        try {
+          GenericConsumer.Load(instance);
+        }
+        catch (Exception ex) {
+          MessageBox.Show(String.Format("This problem does not support loading the instance {0}: {1}", descriptor.Name, Environment.NewLine + ex.Message), "Cannot load instance");
+        }
+      }
     }
   }