Changeset 10219

Timestamp:

12/11/13 15:56:17 (11 years ago)

Author:

pfleck

Message:

• Added PreprocessingContext
• Changed content type of DataPreprocessingView to PreprocessingContext

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing/3.3/DataPreprocessingView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingContext.cs (added)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingContext.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/DataPreprocessingView.cs

@@ -3 +3 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DataPreprocessing {
   [View("Data Preprocessing View")]
-  [Content(typeof(DataAnalysisProblemData), false)]
+  [Content(typeof(IPreprocessingContext), false)]
+  [Content(typeof(PreprocessingContext), true)]
   public partial class DataPreprocessingView : ItemView {
 
-    public new DataAnalysisProblemData Content {
-      get { return (DataAnalysisProblemData)base.Content; }
+    public new IPreprocessingContext Content {
+      get { return (IPreprocessingContext)base.Content; }
       set { base.Content = value; }
     }
@@ -21 +21 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-
-
-
     }
 
     private void button1_Click(object sender, System.EventArgs e) {
+
+
+      /*
       DataAnalysisProblemData problemData = Content;
       Dataset ds = problemData.Dataset;
@@ -36 +36 @@
 
       MessageBox.Show("Success ;)");
+      */
     }
   }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -84 +84 @@
       <DependentUpon>DataPreprocessingView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Implementations\PreprocessingContext.cs" />
     <Compile Include="Implementations\PreprocessingData.cs" />
     <Compile Include="Implementations\PreprocessingDataManipulation.cs" />
     <Compile Include="Implementations\StatisticInfo.cs" />
+    <Compile Include="Interfaces\IPreprocessingContext.cs" />
     <Compile Include="Interfaces\IStatisticInfo.cs" />
     <Compile Include="Interfaces\IPreprocessingData.cs" />

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame

@@ -44 +44 @@
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
+  [PluginDependency("HeuristicLab.DataPreprocessing", "3.3")]
   public class HeuristicLabProblemsDataAnalysisViewsPlugin : PluginBase {
   }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs

@@ -104 +104 @@
 
     private void DataPreprocessingButton_Click(object sender, EventArgs e) {
-      // IItem i = GetAlgorithmOrProblemContent();
-      Type viewType = MainFormManager.GetViewTypes(this.Content.GetType(), true).FirstOrDefault(t => typeof(DataPreprocessingView).IsAssignableFrom(t));
-      MainFormManager.MainForm.ShowContent(Content, viewType);
+      IItem parentItem = GetAlgorithmOrProblem();
+      var preprocessingData = new PreprocessingData(Content);
+
+      // TODO: ProblemDataView depends on DataPreprocessing
+      var context = new PreprocessingContext(preprocessingData, parentItem);
+      MainFormManager.MainForm.ShowContent(context);
+
+      //Type viewType = MainFormManager.GetViewTypes(this.Content.GetType(), true).FirstOrDefault(t => typeof(DataPreprocessingView).IsAssignableFrom(t));
+      //MainFormManager.MainForm.ShowContent(Content, viewType);
     }
 
-    private IItem GetAlgorithmOrProblemContent() {
+    private IItem GetAlgorithmOrProblem() {
       Control a = this;
       IItem i = null;