Changeset 11281

Timestamp:

08/18/14 14:29:03 (10 years ago)

Author:

mkommend

Message:

#2214: Merged r11214 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessorStarter.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IDataPreprocessorStarter.cs (modified) (1 diff)

stable/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessorStarter.cs

@@ -21 +21 @@
 
 using System.Windows.Forms;
-using HeuristicLab.Core;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Views;
-using View = HeuristicLab.MainForm.WindowsForms.View;
 
 namespace HeuristicLab.DataPreprocessing.Views {
   public class DataPreprocessorStarter : IDataPreprocessorStarter {
 
-    public void Start(IDataAnalysisProblemData problemData, View currentView) {
+    public void Start(IDataAnalysisProblemData problemData, IContentView currentView) {
       IAlgorithm algorithm;
       IDataAnalysisProblem problem;
-      IItem parentItem = GetMostOuterContent(currentView, out algorithm, out problem);
+      GetMostOuterContent(currentView as Control, out algorithm, out problem);
       var context = new PreprocessingContext(problemData, algorithm, problem);
       MainFormManager.MainForm.ShowContent(context);
     }
 
-    private IItem GetMostOuterContent(Control control, out IAlgorithm algorithm, out IDataAnalysisProblem problem) {
+    private void GetMostOuterContent(Control control, out IAlgorithm algorithm, out IDataAnalysisProblem problem) {
       algorithm = null;
       problem = null;
-      ItemView itemView = null;
-      do {
+
+      while (control != null) {
+        IContentView contentView = control as IContentView;
+        if (contentView != null) {
+          algorithm = contentView.Content as IAlgorithm;
+          problem = contentView.Content as IDataAnalysisProblem;
+        }
         control = control.Parent;
-        if (control is ItemView) {
-          itemView = (ItemView)control;
-          if (itemView.Content is IAlgorithm) {
-            algorithm = (IAlgorithm)itemView.Content;
-          }
-          if (itemView.Content is IDataAnalysisProblem) {
-            problem = (IDataAnalysisProblem)itemView.Content;
-          }
-        }
-      } while (control != null);
-
-      return itemView.Content;
+      }
     }
   }

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Interfaces/IDataPreprocessorStarter.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   public interface IDataPreprocessorStarter {
-    void Start(IDataAnalysisProblemData problemData, View currentView);
+    void Start(IDataAnalysisProblemData problemData, IContentView currentView);
   }
 }