Changeset 10658 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Timestamp:

03/26/14 10:52:55 (11 years ago)

Author:

aesterer

Message:

Created base view PreprocessingChartView for LineChartView and HistogramView. Replaced HistogramLogic and LineChartlogic with ChartLogic. Added base content ChartContent for LineChartContent and HistogramContent.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (2 diffs)
• Implementations/ChartLogic.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartLogic.cs) (2 diffs)
• Implementations/HistogramContent.cs (modified) (2 diffs)
• Implementations/HistogramLogic.cs (deleted)
• Implementations/LineChartContent.cs (modified) (3 diffs)
• Implementations/PreprocessingChartContent.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartContent.cs) (2 diffs)
• Interfaces/IChartLogic.cs (moved) (moved from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/ILineChartLogic.cs) (2 diffs)
• Interfaces/IHistogramLogic.cs (deleted)

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

@@ -72 +72 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Implementations\PreprocessingChartContent.cs" />
     <Compile Include="Implementations\PreprocessingData.cs" />
     <Compile Include="Implementations\DataGridLogic.cs" />
@@ -83 +84 @@
     <Compile Include="Implementations\FilterLogic.cs" />
     <Compile Include="Implementations\HistogramContent.cs" />
-    <Compile Include="Implementations\HistogramLogic.cs" />
     <Compile Include="Implementations\LineChartContent.cs" />
-    <Compile Include="Implementations\LineChartLogic.cs" />
+    <Compile Include="Implementations\ChartLogic.cs" />
     <Compile Include="Implementations\StatisticsContent.cs" />
     <Compile Include="Implementations\TransformationContent.cs" />
     <Compile Include="Implementations\TransformationLogic.cs" />
     <Compile Include="Interfaces\IFilterLogic.cs" />
-    <Compile Include="Interfaces\IHistogramLogic.cs" />
-    <Compile Include="Interfaces\ILineChartLogic.cs" />
+    <Compile Include="Interfaces\IChartLogic.cs" />
     <Compile Include="Interfaces\IManipulationLogic.cs" />
     <Compile Include="Interfaces\ITransformationLogic.cs" />

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/ChartLogic.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  public class LineChartLogic : ILineChartLogic {
+
+  public class ChartLogic : IChartLogic {
  
     private ITransactionalPreprocessingData preprocessingData;
 
-    public LineChartLogic(ITransactionalPreprocessingData preprocessingData) {
+    public ChartLogic(ITransactionalPreprocessingData preprocessingData) {
       this.preprocessingData = preprocessingData;
     }
 
-    public DataTable CreateDataTable(String title) {
+    public DataTable CreateDataTable(String title, DataRowVisualProperties.DataRowChartType chartType) {
       DataTable dataTable = new DataTable(title);
       IEnumerable<string> variableNames = GetVariableNames();
 
       foreach (string variableName in variableNames) {
-        DataRow row = CreateDataRow(variableName);
+        DataRow row = CreateDataRow(variableName,chartType);
         dataTable.Rows.Add(row);
       }
@@ -46 +47 @@
     }
 
-    public DataRow CreateDataRow(string variableName) {
+    public DataRow CreateDataRow(string variableName, DataRowVisualProperties.DataRowChartType chartType) {
       IList<double> values = preprocessingData.GetValues<double>(variableName);
       DataRow row = new DataRow(variableName, "", values);
+      row.VisualProperties.ChartType = chartType;
       return row;
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/HistogramContent.cs

@@ -26 +26 @@
 namespace HeuristicLab.DataPreprocessing {
   [Item("Histogram", "Represents the histogram grid.")]
-  public class HistogramContent : Item, IViewShortcut {
+  public class HistogramContent : PreprocessingChartContent {
 
-    private readonly IHistogramLogic histogramLogic;
-    public HistogramContent(IHistogramLogic theHistogramLogic) {
-      histogramLogic = theHistogramLogic;
+    public HistogramContent(IChartLogic chartlogic) :base(chartlogic) {
     }
 
@@ -36 +34 @@
       : base(content, cloner) {
 
-    }
-
-    public IHistogramLogic HistogramLogic {
-      get {
-        return histogramLogic;
-      }
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/LineChartContent.cs

@@ -26 +26 @@
 namespace HeuristicLab.DataPreprocessing {
   [Item("LineChart", "Represents the line chart grid.")]
-  public class LineChartContent : Item, IViewShortcut {
+  public class LineChartContent : PreprocessingChartContent {
 
-    private readonly ILineChartLogic lineChartLogic;
-    public LineChartContent(ILineChartLogic theLineChartLogic) {
-      lineChartLogic = theLineChartLogic;
+    public LineChartContent(IChartLogic chartlogic) :base(chartlogic) {
     }
 
@@ -36 +34 @@
       : base(content, cloner) {
 
-    }
-
-    public ILineChartLogic LineChartLogic {
-      get {
-        return lineChartLogic;
-      }
     }
 
@@ -52 +44 @@
     }
 
-    public event DataPreprocessingChangedEventHandler Changed {
-      add { lineChartLogic.Changed += value; }
-      remove { lineChartLogic.Changed -= value; }
-    }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingChartContent.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  [Item("LineChart", "Represents the line chart grid.")]
-  public class LineChartContent : Item, IViewShortcut {
+  [Item("PreprocessingChart", "Represents a preprocessing chart.")]
+  public class PreprocessingChartContent : Item, IViewShortcut {
 
-    private readonly ILineChartLogic lineChartLogic;
-    public LineChartContent(ILineChartLogic theLineChartLogic) {
-      lineChartLogic = theLineChartLogic;
+    private readonly IChartLogic chartLogic;
+    public PreprocessingChartContent(IChartLogic chartLogic) {
+      this.chartLogic = chartLogic;
     }
 
-    public LineChartContent(LineChartContent content, Cloner cloner)
+    public PreprocessingChartContent(PreprocessingChartContent content, Cloner cloner)
       : base(content, cloner) {
-
     }
 
-    public ILineChartLogic LineChartLogic {
+    public IChartLogic ChartLogic {
       get {
-        return lineChartLogic;
+        return chartLogic;
       }
     }
@@ -49 +48 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LineChartContent(this, cloner);
+      return new PreprocessingChartContent(this, cloner);
     }
 
     public event DataPreprocessingChangedEventHandler Changed {
-      add { lineChartLogic.Changed += value; }
-      remove { lineChartLogic.Changed -= value; }
+      add { chartLogic.Changed += value; }
+      remove { chartLogic.Changed -= value; }
     }
   }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IChartLogic.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  public interface ILineChartLogic {
+  public interface IChartLogic {
 
-    DataTable CreateDataTable(string title);
+    DataTable CreateDataTable(string title, DataRowVisualProperties.DataRowChartType chartType);
 
     event DataPreprocessingChangedEventHandler Changed;
@@ -34 +34 @@
     ICheckedItemList<StringValue> CreateVariableItemList();
 
-    DataRow CreateDataRow(string variableName);
+    DataRow CreateDataRow(string variableName,DataRowVisualProperties.DataRowChartType chartType);
 
     string GetVariableNameByIndex(int index);