Changeset 1886 for trunk/sources/HeuristicLab.Visualization

Timestamp:

05/23/09 11:21:29 (16 years ago)

Author:

mstoeger

Message:

removed unused interfaces/classes. reordered methods. #498

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• ChartDataModelBase.cs (deleted)
• ChartDataRowsModel.cs (modified) (3 diffs)
• HeuristicLab.Visualization-3.2.csproj (modified) (2 diffs)
• IChartDataModel.cs (deleted)
• IChartDataRowsModel.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization/3.2/ChartDataRowsModel.cs

@@ -12 +12 @@
   public delegate void ModelChangedHandler();
 
-  public class ChartDataRowsModel : ChartDataModelBase, IChartDataRowsModel{
+  public class ChartDataRowsModel : ItemBase, IChartDataRowsModel {
     private string title = "Title";
-
     private ViewSettings viewSettings = new ViewSettings();
-
     private readonly XAxisDescriptor xAxisDescriptor = new XAxisDescriptor();
+    private readonly YAxisDescriptor defaultYAxisDescriptor = new YAxisDescriptor();
+    private readonly List<IDataRow> rows = new List<IDataRow>();
 
     public ChartDataRowsModel() {
       this.XAxis.XAxisDescriptorChanged += delegate { OnModelChanged(); };
+    }
+
+    public override IView CreateView() {
+      return new LineChart(this);
+    }
+
+    public string Title {
+      get { return title; }
+      set {
+        title = value;
+        OnModelChanged();
+      }
     }
 
@@ -39 +51 @@
     }
 
-
-    private readonly List<IDataRow> rows = new List<IDataRow>();
+    public YAxisDescriptor DefaultYAxis {
+      get { return defaultYAxisDescriptor; }
+    }
 
     public List<IDataRow> Rows{
       get { return rows; }
     }
-
-    public string Title {
-      get { return title; }
-      set {
-        title = value;
-        OnModelChanged();
-      }
-    }
-
-    public override IView CreateView() {
-      return new LineChart(this);
-    }
-
-    private readonly YAxisDescriptor defaultYAxisDescriptor = new YAxisDescriptor();
 
     public void AddDataRow(IDataRow row) {
@@ -71 +70 @@
       rows.Remove(row);
       OnDataRowRemoved(row);
-    }
-
-    public YAxisDescriptor DefaultYAxis {
-      get { return defaultYAxisDescriptor; }
     }
 

trunk/sources/HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj

@@ -97 +97 @@
     </Compile>
     <Compile Include="ChangeType.cs" />
-    <Compile Include="ChartDataModelBase.cs" />
     <Compile Include="ChartDataRowsModel.cs" />
     <Compile Include="ChartDataRowsModelDummy.cs" />
@@ -150 +149 @@
     <Compile Include="DrawingStyle.cs" />
     <Compile Include="HeuristicLabVisualizationPlugin.cs" />
-    <Compile Include="IChartDataModel.cs" />
     <Compile Include="IChartDataRowsModel.cs" />
     <Compile Include="IDataRow.cs" />

trunk/sources/HeuristicLab.Visualization/3.2/IChartDataRowsModel.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
-using HeuristicLab.Visualization.LabelProvider;
 using HeuristicLab.Visualization.Options;
 
@@ -7 +6 @@
   public interface IChartDataRowsModel : IItem {
     string Title { get; set; }
-    List<IDataRow> Rows { get; }
 
     XAxisDescriptor XAxis { get; }
     List<YAxisDescriptor> YAxes { get; }
 
+    List<IDataRow> Rows { get; }
     void AddDataRow(IDataRow row);
     void RemoveDataRow(IDataRow row);