Changeset 6666 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

08/17/11 14:37:34 (13 years ago)

Author:

mkommend

Message:

#1592: Enabled creation of empty ensemble solutions and problem data changes.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• Classification/ClassificationEnsembleSolutionModelView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• Regression/RegressionEnsembleSolutionModelView.cs (modified) (3 diffs)
• Solution Views/ClassificationEnsembleSolutionView.Designer.cs (added)
• Solution Views/ClassificationEnsembleSolutionView.cs (added)
• Solution Views/ClassificationSolutionView.cs (modified) (2 diffs)
• Solution Views/DataAnalysisSolutionView.cs (modified) (2 diffs)
• Solution Views/RegressionEnsembleSolutionView.Designer.cs (added)
• Solution Views/RegressionEnsembleSolutionView.cs (added)
• Solution Views/RegressionSolutionView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionModelView.cs

@@ -19 +19 @@
  */
 #endregion
+
+using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -44 +47 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content != null)
+      if (Content != null) {
+        view.Locked = Content.ProblemData == ClassificationEnsembleProblemData.EmptyProblemData;
         view.Content = Content.ClassificationSolutions;
-      else
+      } else
         view.Content = null;
     }
@@ -62 +66 @@
         detailsGroupBox.Enabled = Content != null && itemsListView.SelectedItems.Count == 1;
       }
+
+      protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
+        validDragOperation = false;
+        if (ReadOnly || Locked) return;
+        if (Content.IsReadOnly) return;
+
+        var dropData = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+        validDragOperation = dropData.GetObjectGraphObjects().OfType<IClassificationSolution>().Any();
+      }
+      protected override void itemsListView_DragDrop(object sender, DragEventArgs e) {
+        if (e.Effect != DragDropEffects.None) {
+          var dropData = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+          var solutions = dropData.GetObjectGraphObjects().OfType<IClassificationSolution>();
+          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+            Cloner cloner = new Cloner();
+            solutions = solutions.Select(s => cloner.Clone(s));
+          }
+          foreach (var solution in solutions)
+            Content.Add(solution);
+        }
+      }
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -182 +182 @@
       <DependentUpon>ClusteringSolutionView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Solution Views\ClassificationEnsembleSolutionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Solution Views\ClassificationEnsembleSolutionView.Designer.cs">
+      <DependentUpon>ClassificationEnsembleSolutionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Solution Views\DiscriminantFunctionClassificationSolutionView.cs">
       <SubType>UserControl</SubType>
@@ -207 +213 @@
     <Compile Include="Solution Views\NamedDataAnalysisSolutionView.Designer.cs">
       <DependentUpon>NamedDataAnalysisSolutionView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Solution Views\RegressionEnsembleSolutionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Solution Views\RegressionEnsembleSolutionView.Designer.cs">
+      <DependentUpon>RegressionEnsembleSolutionView.cs</DependentUpon>
     </Compile>
     <Compile Include="Solution Views\RegressionSolutionView.cs">

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.cs

@@ -19 +19 @@
  */
 #endregion
+
+using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -44 +47 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content != null)
+      if (Content != null) {
+        view.Locked = Content.ProblemData == RegressionEnsembleProblemData.EmptyProblemData;
         view.Content = Content.RegressionSolutions;
-      else
+      } else
         view.Content = null;
     }
@@ -59 +63 @@
         addButton.Enabled = Content != null && !Content.IsReadOnly && !Locked;
         removeButton.Enabled = Content != null && !Content.IsReadOnly && !Locked && itemsListView.SelectedItems.Count > 0;
-        itemsListView.Enabled = Content != null;
+        itemsListView.Enabled = Content != null && !Locked;
         detailsGroupBox.Enabled = Content != null && itemsListView.SelectedItems.Count == 1;
+      }
+
+      protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
+        validDragOperation = false;
+        if (ReadOnly || Locked) return;
+        if (Content.IsReadOnly) return;
+
+        var dropData = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+        validDragOperation = dropData.GetObjectGraphObjects().OfType<IRegressionSolution>().Any();
+      }
+      protected override void itemsListView_DragDrop(object sender, DragEventArgs e) {
+        if (e.Effect != DragDropEffects.None) {
+          var dropData = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+          var solutions = dropData.GetObjectGraphObjects().OfType<IRegressionSolution>();
+          if (e.Effect.HasFlag(DragDropEffects.Copy)) {
+            Cloner cloner = new Cloner();
+            solutions = solutions.Select(s => cloner.Clone(s));
+          }
+          foreach (var solution in solutions)
+            Content.Add(solution);
+        }
       }
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/ClassificationSolutionView.cs

@@ -21 +21 @@
 
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 
@@ -39 +40 @@
     protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
       validDragOperation = false;
-      if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is ClassificationProblemData)) {
-        validDragOperation = true;
+      if (ReadOnly) return;
+
+      var dropData = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+      if (dropData is ClassificationProblemData) validDragOperation = true;
+      else if (dropData is IValueParameter) {
+        var param = (IValueParameter)dropData;
+        if (param.Value is ClassificationProblemData) validDragOperation = true;
       }
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.cs

@@ -44 +44 @@
     }
 
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      addButton.Enabled = false;
+      removeButton.Enabled = false;
+    }
+
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
+    }
+    protected override void DeregisterContentEvents() {
+      base.DeregisterContentEvents();
+      Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
+    }
+    private void Content_ProblemDataChanged(object sender, EventArgs e) {
+      OnContentChanged();
+    }
+
     protected override void OnContentChanged() {
       string selectedName = null;
@@ -66 +84 @@
 
     protected virtual void AddEvaluationViewTypes() {
-      if (Content != null) {
+      if (Content != null && !Content.ProblemData.IsEmpty) {
         var viewTypes = MainFormManager.GetViewTypes(Content.GetType(), true)
           .Where(t => typeof(IDataAnalysisSolutionEvaluationView).IsAssignableFrom(t));

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs

@@ -21 +21 @@
 
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 
@@ -39 +40 @@
     protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
       validDragOperation = false;
-      if (!ReadOnly && (e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat) is RegressionProblemData)) {
-        validDragOperation = true;
+      if (ReadOnly) return;
+
+      var dropData = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+      if (dropData is RegressionProblemData) validDragOperation = true;
+      else if (dropData is IValueParameter) {
+        var param = (IValueParameter)dropData;
+        if (param.Value is RegressionProblemData) validDragOperation = true;
       }
     }