Changeset 1457

Timestamp:

03/27/09 17:34:56 (15 years ago)

Author:

mstoeger

Message:

Implement Y-Axis Position (left/right) (#554)

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/LineChartTests.cs (modified) (2 diffs)
• HeuristicLab.Visualization/AxisPosition.cs (added)
• HeuristicLab.Visualization/HeuristicLab.Visualization.csproj (modified) (2 diffs)
• HeuristicLab.Visualization/LineChart.cs (modified) (5 diffs)
• HeuristicLab.Visualization/YAxis.cs (modified) (3 diffs)
• HeuristicLab.Visualization/YAxisDescriptor.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Visualization.Test/LineChartTests.cs

@@ -84 +84 @@
       yaxis1.Label = "Y-Axis 1";
       yaxis2.Label = "Y-Axis 2";
+
+      yaxis1.Position = AxisPosition.Left;
+      yaxis2.Position = AxisPosition.Right;
 
       row1.Color = Color.Red;
@@ -500 +503 @@
     }
 
-
-
     [Test]
     public void TestMainForm() {

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

@@ -4 +4 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E392A1E2-DC95-4E33-B82E-8ED690EDA1AB}</ProjectGuid>
@@ -70 +70 @@
     <Compile Include="AvgAggregator.cs" />
     <Compile Include="AvgLineAggregator.cs" />
+    <Compile Include="AxisPosition.cs" />
     <Compile Include="AxisTicks.cs" />
     <Compile Include="Canvas.cs" />

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -6 +6 @@
 using HeuristicLab.Visualization.Legend;
 using HeuristicLab.Visualization.Options;
+using HeuristicLab.Visualization.Test;
 
 namespace HeuristicLab.Visualization {
@@ -93 +94 @@
       canvas.AddShape(xAxis);
 
-      int yAxesWidth = 0;
+      int yAxesWidthLeft = 0;
+      int yAxesWidthRight = 0;
 
       foreach (YAxisDescriptor yAxisDescriptor in model.YAxes) {
@@ -99 +101 @@
         if (yAxisDescriptor.ShowYAxis) {
           canvas.AddShape(info.YAxis);
-          yAxesWidth += YAxisWidth;
+          info.YAxis.Position = yAxisDescriptor.Position;
+          switch (yAxisDescriptor.Position) {
+            case AxisPosition.Left:
+              yAxesWidthLeft += YAxisWidth;
+              break;
+            case AxisPosition.Right:
+              yAxesWidthRight += YAxisWidth;
+              break;
+            default:
+              throw new NotImplementedException();
+          }
         }
       }
@@ -111 +123 @@
       titleShape.Y = canvasUI.Height - 10;
 
-      RectangleD linesAreaBoundingBox = new RectangleD(yAxesWidth,
+      RectangleD linesAreaBoundingBox = new RectangleD(yAxesWidthLeft,
                                                        XAxisHeight,
-                                                       canvasUI.Width,
+                                                       canvasUI.Width - yAxesWidthRight,
                                                        canvasUI.Height);
 
@@ -126 +138 @@
 
       int yAxisLeft = 0;
+      int yAxisRight = (int)linesAreaBoundingBox.X2;
+
       foreach (YAxisDescriptor yAxisDescriptor in model.YAxes) {
         YAxisInfo info = GetYAxisInfo(yAxisDescriptor);
         if (yAxisDescriptor.ShowYAxis) {
-          info.YAxis.BoundingBox = new RectangleD(yAxisLeft,
-                                                 linesAreaBoundingBox.Y1,
-                                                 yAxisLeft + YAxisWidth,
-                                                 linesAreaBoundingBox.Y2);
-          yAxisLeft += YAxisWidth;
+          switch (yAxisDescriptor.Position) {
+            case AxisPosition.Left:
+              info.YAxis.BoundingBox = new RectangleD(yAxisLeft,
+                                                      linesAreaBoundingBox.Y1,
+                                                      yAxisLeft + YAxisWidth,
+                                                      linesAreaBoundingBox.Y2);
+              yAxisLeft += YAxisWidth;
+              break;
+            case AxisPosition.Right:
+              info.YAxis.BoundingBox = new RectangleD(yAxisRight,
+                                                      linesAreaBoundingBox.Y1,
+                                                      yAxisRight + YAxisWidth,
+                                                      linesAreaBoundingBox.Y2);
+              yAxisRight += YAxisWidth;
+              break;
+            default:
+              throw new NotImplementedException();
+          }
         }
       }

trunk/sources/HeuristicLab.Visualization/YAxis.cs

@@ +1 @@
+using System;
 using System.Drawing;
 using HeuristicLab.Visualization.LabelProvider;
+using HeuristicLab.Visualization.Test;
 
 namespace HeuristicLab.Visualization {
@@ -7 +9 @@
 
     private ILabelProvider labelProvider = new ContinuousLabelProvider("e4");
+    private AxisPosition position = AxisPosition.Left;
 
     public ILabelProvider LabelProvider {
       get { return labelProvider; }
       set { labelProvider = value; }
+    }
+
+    public AxisPosition Position {
+      get { return position; }
+      set { position = value; }
     }
 
@@ -19 +27 @@
                                               ClippingArea.Height,
                                               ClippingArea.Y1)) {
-        TextShape label = new TextShape(ClippingArea.X2 - 3, y,
-                                        labelProvider.GetLabel(y));
-        label.AnchorPositionX = AnchorPositionX.Right;
+        double x;
+        AnchorPositionX anchorPositionX;
+
+        switch (position) {
+          case AxisPosition.Left:
+            x = ClippingArea.X2 - 3;
+            anchorPositionX = AnchorPositionX.Right;
+            break;
+          case AxisPosition.Right:
+            x = ClippingArea.X1 + 3;
+            anchorPositionX = AnchorPositionX.Left;
+            break;
+          default:
+            throw new NotImplementedException();
+        }
+        
+        TextShape label = new TextShape(x, y, labelProvider.GetLabel(y));
+        label.AnchorPositionX = anchorPositionX;
         label.AnchorPositionY = AnchorPositionY.Middle;
         AddShape(label);

trunk/sources/HeuristicLab.Visualization/YAxisDescriptor.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using HeuristicLab.Visualization.LabelProvider;
+using HeuristicLab.Visualization.Test;
 
 namespace HeuristicLab.Visualization {
@@ -12 +13 @@
     private string label = "";
     public bool ClipChangeable = true;
+    private AxisPosition position = AxisPosition.Left;
 
     public event YAxisDescriptorChangedHandler YAxisDescriptorChanged;
@@ -78 +80 @@
     }
 
+    public AxisPosition Position {
+      get { return position; }
+      set { position = value; }
+    }
+
     public void AddDataRow(IDataRow row) {
       if (row.YAxis != null) {