Changeset 1194 for trunk/sources

Timestamp:

01/30/09 17:03:15 (16 years ago)

Author:

mstoeger

Message:

Implemented a continuous-, discrete- and string- label provider for the X/Y axis labels. (#433)

Location:

trunk/sources/HeuristicLab.Visualization

Files:

• ChartDataRowsModel.cs (modified) (3 diffs)
• DataRow.cs (modified) (2 diffs)
• HeuristicLab.Visualization.csproj (modified) (2 diffs)
• IChartDataRowsModel.cs (modified) (1 diff)
• IDataRow.cs (modified) (1 diff)
• LabelProvider (added)
• LabelProvider/ContinuousLabelProvider.cs (moved) (moved from trunk/sources/HeuristicLab.Visualization/DefaultLabelProvider.cs) (1 diff)
• LabelProvider/DiscreteLabelProvider.cs (added)
• LabelProvider/ILabelProvider.cs (moved) (moved from trunk/sources/HeuristicLab.Visualization/ILabelProvider.cs) (1 diff)
• LabelProvider/StringLabelProvider.cs (added)
• XAxis.cs (modified) (1 diff)
• YAxis.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Visualization/ChartDataRowsModel.cs

@@ -5 +5 @@
 using HeuristicLab.Core;
 using System.Text;
+using HeuristicLab.Visualization.LabelProvider;
 
 namespace HeuristicLab.Visualization{
@@ -14 +15 @@
     private string title = "Title";
     //private string xAxisLabel;
-    private ILabelProvider labelProvider = new DefaultLabelProvider("0.##");
+    private ILabelProvider labelProvider = new ContinuousLabelProvider("0.##");
 
     public ILabelProvider XAxisLabelProvider {
@@ -144 +145 @@
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
 
-      foreach (var row in rows) {
+      foreach (IDataRow row in rows) {
         XmlNode columnElement = document.CreateNode(XmlNodeType.Element, "row", null);
 
         XmlAttribute idAttr = document.CreateAttribute("label");
-        idAttr.Value = row.Label.ToString();
+        idAttr.Value = row.Label;
         columnElement.Attributes.Append(idAttr);
 

trunk/sources/HeuristicLab.Visualization/DataRow.cs

@@ -2 +2 @@
 using System.Drawing;
 using System.Collections.Generic;
+using HeuristicLab.Visualization.LabelProvider;
 
 namespace HeuristicLab.Visualization {
@@ -22 +23 @@
     private List<double> dataRow = new List<double>();
 
-    private ILabelProvider labelProvider = new DefaultLabelProvider("0.##");
+    private ILabelProvider labelProvider = new ContinuousLabelProvider("0.##");
 
     public DataRowType LineType{

trunk/sources/HeuristicLab.Visualization/HeuristicLab.Visualization.csproj

@@ -81 +81 @@
     <Compile Include="CompositeShape.cs" />
     <Compile Include="ChartDataRowsModelDataCollector.cs" />
-    <Compile Include="DefaultLabelProvider.cs" />
+    <Compile Include="LabelProvider\ContinuousLabelProvider.cs" />
+    <Compile Include="LabelProvider\DiscreteLabelProvider.cs" />
     <Compile Include="Grid.cs" />
     <Compile Include="HorizontalLineShape.cs" />
-    <Compile Include="ILabelProvider.cs" />
+    <Compile Include="LabelProvider\ILabelProvider.cs" />
     <Compile Include="IMouseEventListener.cs" />
     <Compile Include="OptionsDialog.cs">
@@ -93 +94 @@
     </Compile>
     <Compile Include="PanListener.cs" />
+    <Compile Include="LabelProvider\StringLabelProvider.cs" />
     <Compile Include="TextShape.cs" />
     <Compile Include="LegendShape.cs" />

trunk/sources/HeuristicLab.Visualization/IChartDataRowsModel.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Visualization.LabelProvider;
 
 namespace HeuristicLab.Visualization {

trunk/sources/HeuristicLab.Visualization/IDataRow.cs

@@ -1 +1 @@
 using System.Drawing;
+using HeuristicLab.Visualization.LabelProvider;
 
 namespace HeuristicLab.Visualization {

trunk/sources/HeuristicLab.Visualization/LabelProvider/ContinuousLabelProvider.cs

@@ -1 +1 @@
 using System.Globalization;
 
-namespace HeuristicLab.Visualization {
-  public class DefaultLabelProvider : ILabelProvider {
+namespace HeuristicLab.Visualization.LabelProvider {
+  public class ContinuousLabelProvider : ILabelProvider {
     private readonly string format;
 
-    public DefaultLabelProvider() {}
+    public ContinuousLabelProvider() {}
 
-    public DefaultLabelProvider(string format) {
+    public ContinuousLabelProvider(string format) {
       this.format = format;
     }

trunk/sources/HeuristicLab.Visualization/LabelProvider/ILabelProvider.cs

@@ -1 @@
-namespace HeuristicLab.Visualization {
+namespace HeuristicLab.Visualization.LabelProvider {
   public interface ILabelProvider {
     string GetLabel(double value);

trunk/sources/HeuristicLab.Visualization/XAxis.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Drawing;
+using HeuristicLab.Visualization.LabelProvider;
 
 namespace HeuristicLab.Visualization {
   public class XAxis : WorldShape {
     public const int PixelsPerInterval = 100;
-    private ILabelProvider labelProvider = new DefaultLabelProvider("0.##");
+    private ILabelProvider labelProvider = new ContinuousLabelProvider("0.####");
 
     public ILabelProvider LabelProvider {

trunk/sources/HeuristicLab.Visualization/YAxis.cs

@@ -1 +1 @@
 using System.Drawing;
+using HeuristicLab.Visualization.LabelProvider;
 
 namespace HeuristicLab.Visualization {
@@ -5 +6 @@
     public const int PixelsPerInterval = 75;
 
-    private ILabelProvider labelProvider = new DefaultLabelProvider("e");
+    private ILabelProvider labelProvider = new ContinuousLabelProvider("e4");
 
     public ILabelProvider LabelProvider {