Changeset 7684

Timestamp:

04/02/12 15:56:16 (12 years ago)

Author:

sforsten

Message:

#1784:

• deleted RegressionProblemView
• deleted of the import button in the DataAnalysisProblemView
• small changes in the views of the Problems.Instances.Views project

Location:

branches/ProblemInstancesRegressionAndClassification

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionProblemView.Designer.cs (deleted)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionProblemView.cs (deleted)
• HeuristicLab.Problems.Instances.Regression/3.4/Properties (modified) (1 prop)
• HeuristicLab.Problems.Instances.Regression/3.4/Properties/AssemblyInfo.cs (deleted)
• HeuristicLab.Problems.Instances.Views/3.4/HeuristicLab.Problems.Instances.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceConsumerView.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceProviderView.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceProviderViewGeneric.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceProviderViewGeneric.cs (modified) (6 diffs)
• HeuristicLab.Problems.Instances.Views/3.4/Properties (modified) (1 prop)
• HeuristicLab.Problems.Instances.Views/3.4/Properties/AssemblyInfo.cs (deleted)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-      this.ImportButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
       this.problemInstanceSplitContainer.Panel1.SuspendLayout();
@@ -56 +55 @@
       // problemInstanceSplitContainer
       // 
-      // 
-      // problemInstanceSplitContainer.Panel2
-      // 
-      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.ImportButton);
-      // 
-      // parameterCollectionView
-      // 
-      this.parameterCollectionView.Location = new System.Drawing.Point(6, 56);
-      this.parameterCollectionView.Size = new System.Drawing.Size(501, 274);
       // 
       // nameTextBox
@@ -76 +66 @@
       this.openFileDialog.Title = "Import data...";
       // 
-      // ImportButton
-      // 
-      this.ImportButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.ImportButton.Location = new System.Drawing.Point(6, 27);
-      this.ImportButton.Name = "ImportButton";
-      this.ImportButton.Size = new System.Drawing.Size(501, 23);
-      this.ImportButton.TabIndex = 14;
-      this.ImportButton.Text = "Import from CSV file";
-      this.ImportButton.UseVisualStyleBackColor = true;
-      this.ImportButton.Click += new System.EventHandler(this.ImportButton_Click);
-      // 
       // DataAnalysisProblemView
       // 
@@ -94 +72 @@
       this.Name = "DataAnalysisProblemView";
       this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
-      this.problemInstanceSplitContainer.Panel1.PerformLayout();
       this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
       this.problemInstanceSplitContainer.Panel2.PerformLayout();
@@ -107 +84 @@
 
     private System.Windows.Forms.OpenFileDialog openFileDialog;
-    private System.Windows.Forms.Button ImportButton;
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization.Views;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -38 +36 @@
       set { base.Content = value; }
     }
-
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
-      ImportButton.Enabled = !Locked && !ReadOnly && Content != null;
-    }
-
-    private void ImportButton_Click(object sender, System.EventArgs e) {
-      if (openFileDialog.ShowDialog(this) == DialogResult.OK) {
-        try {
-          Content.ImportProblemDataFromFile(openFileDialog.FileName);
-        }
-        catch (Exception ex) {
-          ErrorHandling.ShowErrorDialog(this, ex);
-        }
-      }
-    }
   }
 }

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -174 +174 @@
     </Compile>
     <Compile Include="Plugin.cs" />
-    <Compile Include="Regression\RegressionProblemView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Regression\RegressionProblemView.Designer.cs">
-      <DependentUpon>RegressionProblemView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.cs">
       <SubType>UserControl</SubType>

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/HeuristicLab.Problems.Instances.Views-3.4.csproj

@@ -85 +85 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="ProblemInstanceConsumerView.resx">
-      <DependentUpon>ProblemInstanceConsumerView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceConsumerView.cs

@@ -32 +32 @@
 namespace HeuristicLab.Problems.Instances.Views {
   [View("ProblemInstanceConsumerView")]
-  [Content(typeof(IProblemInstanceConsumer), IsDefaultView = true)]
+  [Content(typeof(IProblemInstanceConsumer), IsDefaultView = false)]
   public sealed partial class ProblemInstanceConsumerView : AsynchronousContentView {
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceProviderView.cs

@@ -26 +26 @@
 namespace HeuristicLab.Problems.Instances.Views {
   [View("ProblemInstanceProviderView")]
-  [Content(typeof(IProblemInstanceProvider), IsDefaultView = true)]
+  [Content(typeof(IProblemInstanceProvider), IsDefaultView = false)]
   public abstract partial class ProblemInstanceProviderView : AsynchronousContentView {
 
@@ -34 +34 @@
     }
 
-    public abstract IProblemInstanceConsumer Consumer { set; }
+    public abstract IProblemInstanceConsumer Consumer { get; set; }
 
-    public abstract IProblemInstanceExporter Exporter { set; }
+    public abstract IProblemInstanceExporter Exporter { get; set; }
 
     public ProblemInstanceProviderView() {

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceProviderViewGeneric.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.Instances.Views {
-  partial class ProblemInstanceProviderView<T> {
+  partial class ProblemInstanceProviderViewGeneric<T> {
     /// <summary> 
     /// Required designer variable.

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Views/3.4/ProblemInstanceProviderViewGeneric.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.Instances.Views {
-  [View("ProblemInstanceProviderView")]
+  [View("ProblemInstanceProviderViewGeneric")]
   [Content(typeof(IProblemInstanceProvider<>), IsDefaultView = true)]
-  public partial class ProblemInstanceProviderView<T> : ProblemInstanceProviderView {
+  public partial class ProblemInstanceProviderViewGeneric<T> : ProblemInstanceProviderView {
 
     public new IProblemInstanceProvider<T> Content {
@@ -39 +39 @@
     }
 
-    private IProblemInstanceConsumer<T> consumer;
-    public override IProblemInstanceConsumer Consumer { set { consumer = (IProblemInstanceConsumer<T>)value; } }
+    private IProblemInstanceConsumer<T> GenericConsumer { get { return (IProblemInstanceConsumer<T>)Consumer; } }
+    public IProblemInstanceConsumer consumer;
+    public override IProblemInstanceConsumer Consumer {
+      get { return consumer; }
+      set {
+        consumer = value;
+        SetEnabledStateOfControls();
+      }
+    }
 
-    private IProblemInstanceExporter<T> exporter;
-    public override IProblemInstanceExporter Exporter { set { exporter = (IProblemInstanceExporter<T>)value; } }
+    private IProblemInstanceExporter<T> GenericExporter { get { return (IProblemInstanceExporter<T>)Exporter; } }
+    private IProblemInstanceExporter exporter;
+    public override IProblemInstanceExporter Exporter {
+      get { return exporter; }
+      set {
+        exporter = value;
+        SetEnabledStateOfControls();
+      }
+    }
 
-    public ProblemInstanceProviderView() {
+    public ProblemInstanceProviderViewGeneric() {
       InitializeComponent();
       importButton.Text = String.Empty;
@@ -70 +84 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      instancesComboBox.Enabled = !ReadOnly && !Locked && Content != null && consumer != null;
-      loadButton.Enabled = !ReadOnly && !Locked && Content != null && consumer != null;
-      exportButton.Enabled = !ReadOnly && !Locked && Content != null && exporter != null;
+      instancesComboBox.Enabled = !ReadOnly && !Locked && Content != null && GenericConsumer != null;
+      loadButton.Enabled = !ReadOnly && !Locked && Content != null && GenericConsumer != null;
+      exportButton.Enabled = !ReadOnly && !Locked && Content != null && GenericExporter != null;
       problemInstanceProviderSplitContainer.Panel2Collapsed = !exportButton.Enabled;
     }
@@ -80 +94 @@
       var instance = Content.LoadData(descriptor);
       try {
-        consumer.Load(instance);
+        GenericConsumer.Load(instance);
       }
       catch (Exception ex) {
@@ -99 +113 @@
         }
         try {
-          consumer.Load(instance);
+          GenericConsumer.Load(instance);
         }
         catch (Exception ex) {
@@ -110 +124 @@
       if (saveFileDialog.ShowDialog(this) == DialogResult.OK) {
         try {
-          Content.SaveData(exporter.Export(), saveFileDialog.FileName);
+          Content.SaveData(GenericExporter.Export(), saveFileDialog.FileName);
         }
         catch (Exception ex) {