Changeset 983

Timestamp:

12/12/08 18:13:12 (16 years ago)

Author:

mstoeger

Message:

Added XAxis shape to project (#433)
Some small refactorings in LineChart (#345)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Visualization.Test/LineChartTests.cs (modified) (2 diffs)
• HeuristicLab.Visualization/HeuristicLab.Visualization.csproj (modified) (2 diffs)
• HeuristicLab.Visualization/LineChart.cs (modified) (10 diffs)
• HeuristicLab.Visualization/XAxis.cs (added)

trunk/sources

@@ -1 +1 @@
 *.suo
+_ReSharper.HeuristicLab
+HeuristicLab.resharper
+HeuristicLab.resharper.user

@@ -1 +1 @@
 *.suo
+_ReSharper.HeuristicLab
+HeuristicLab.resharper
+HeuristicLab.resharper.user

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

@@ +1 @@
+using System;
 using System.Drawing;
 using NUnit.Framework;
@@ -47 +48 @@
       row3.AddValue(2);
 
+      Random rand = new Random();
+
+      for (int i = 0; i < 1000; i++) {
+        row1.AddValue(rand.NextDouble()*10);
+        row2.AddValue(rand.NextDouble()*10);
+        row3.AddValue(rand.NextDouble()*10);
+      }
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestAxes() {
+      LineChartTestForm f = new LineChartTestForm();
+
+      IDataRow row1 = new DataRow();
+
+      row1.Color = Color.Red;
+      row1.Thickness = 3;
+      row1.Style = DrawingStyle.Solid;
+
+      f.Model.AddDataRow(row1);
+
+      row1.AddValue(10);
+      row1.AddValue(5);
+      row1.AddValue(7);
+      row1.AddValue(3);
+      row1.AddValue(10);
+      row1.AddValue(2);
+
       f.ShowDialog();
     }

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>
@@ -106 +106 @@
     <Compile Include="Transform.cs" />
     <Compile Include="WorldShape.cs" />
+    <Compile Include="XAxis.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
@@ -14 +13 @@
     private double maxDataValue;
 
+    private readonly WorldShape root;
+    private readonly XAxis xAxis;
+
     /// <summary>
     /// This constructor shouldn't be called. Only required for the designer.
@@ -32 +34 @@
       //TODO: correct Rectangle to fit
       RectangleD clientRectangle = new RectangleD(-1, -1, 1, 1);
-      canvasUI1.MainCanvas.WorldShape = new WorldShape(clientRectangle, clientRectangle);
+
+      root = new WorldShape(clientRectangle, clientRectangle);
+
+      xAxis = new XAxis();
+      root.AddShape(xAxis);
+
+      canvasUI1.MainCanvas.WorldShape = root;
           
       CreateMouseEventListeners();
          
       this.model = model;
-      Item = (IItem)model;
+      Item = model;
       maxDataRowCount = 0; 
       //The whole data rows are shown per default
@@ -84 +92 @@
         maxDataRowCount-0.9,
         maxDataValue + ((maxDataValue - minDataValue) * 0.05));
-      canvasUI1.MainCanvas.WorldShape.ClippingArea = newClippingArea;
+      root.ClippingArea = newClippingArea;
     }
 
@@ -92 +100 @@
       List<LineShape> lineShapes = new List<LineShape>();
       if (row.Count > 0) {
-        maxDataValue = Max(row[0], this.maxDataValue);
-        minDataValue = Min(row[0], minDataValue);
+        maxDataValue = Math.Max(row[0], this.maxDataValue);
+        minDataValue = Math.Min(row[0], minDataValue);
       }
       for (int i = 1; i < row.Count; i++) {
@@ -99 +107 @@
         lineShapes.Add(lineShape);
         // TODO each DataRow needs its own WorldShape so Y Axes can be zoomed independently.
-        canvasUI1.MainCanvas.WorldShape.AddShape(lineShape);
-        maxDataValue = Max(row[i], maxDataValue);
-        minDataValue = Min(row[i], minDataValue);
+        root.AddShape(lineShape);
+        maxDataValue = Math.Max(row[i], maxDataValue);
+        minDataValue = Math.Min(row[i], minDataValue);
       }
 
@@ -109 +117 @@
     }
 
-    private double Min(double d, double value) {
-      return d < value ? d : value;
-    }
-
-    private double Max(double d, double value) {
-      return d>value ? d : value;
-    }
-
     private void OnDataRowRemoved(IDataRow row) {
       row.ValueChanged -= OnRowValueChanged;
@@ -127 +127 @@
     private void OnRowValueChanged(IDataRow row, double value, int index, Action action) {
       List<LineShape> lineShapes = rowToLineShapes[row];
-      maxDataValue = Max(value, maxDataValue);
-      minDataValue = Min(value, minDataValue);
+      maxDataValue = Math.Max(value, maxDataValue);
+      minDataValue = Math.Min(value, minDataValue);
 
       if (index > lineShapes.Count + 1) {
@@ -206 +206 @@
       canvasUI1.MouseEventListener = panListener;
 
-      startClippingArea = canvasUI1.MainCanvas.WorldShape.ClippingArea;
+      startClippingArea = root.ClippingArea;
     }
 
@@ -228 +228 @@
       newClippingArea.Y2 = startClippingArea.Y2 - yDiff;
 
-      canvasUI1.MainCanvas.WorldShape.ClippingArea = newClippingArea;
+      root.ClippingArea = newClippingArea;
       panListener.StartPoint = startPoint;
 

@@ -1 +1 @@
 *.suo
+_ReSharper.HeuristicLab
+HeuristicLab.resharper
+HeuristicLab.resharper.user