Changeset 869 for trunk/sources

Timestamp:

11/29/08 13:08:35 (16 years ago)

Author:

mstoeger

Message:

Adjustments on LineChart for new interface. #345

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/HeuristicLab.Visualization.Test.csproj (modified) (4 diffs)
• HeuristicLab.Visualization.Test/LineChartTests.cs (modified) (2 diffs)
• HeuristicLab.Visualization/CanvasUI.cs (modified) (3 diffs)
• HeuristicLab.Visualization/LineChart.Designer.cs (modified) (1 diff)
• HeuristicLab.Visualization/LineChart.cs (modified) (7 diffs)
• HeuristicLab.Visualization/LineShape.cs (modified) (3 diffs)

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

@@ -52 +52 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>NUnit-2.4.8-bin\nunit.framework.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -76 +80 @@
       <DependentUpon>LegendForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="LineChartTestForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="LineChartTestForm.Designer.cs">
+      <DependentUpon>LineChartTestForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LineChartTests.cs" />
     <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
@@ -89 +100 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Core\HeuristicLab.Core.csproj">
+      <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
+      <Name>HeuristicLab.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
@@ -99 +114 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="LineChartTestForm.resx">
+      <DependentUpon>LineChartTestForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="MainForm.resx">
       <DependentUpon>MainForm.cs</DependentUpon>

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

@@ +1 @@
+using System.Drawing;
 using NUnit.Framework;
 
@@ -8 +9 @@
       LineChartTestForm f = new LineChartTestForm();
 
-      IDataRow row = new DataRow();
-      f.Model.AddDataRow(row);
+      IDataRow row1 = new DataRow();
+      IDataRow row2 = new DataRow();
+      IDataRow row3 = new DataRow();
 
-      row.AddValue(10);
-      row.AddValue(5);
-      row.AddValue(7);
-      row.AddValue(3);
-      row.AddValue(10);
-      row.AddValue(2);
+      row1.Color = Color.Red;
+      row2.Color = Color.Green;
+      row3.Color = Color.Blue;
+
+      row1.Thickness = 3;
+      row2.Thickness = 4;
+      row3.Thickness = 5;
+
+      f.Model.AddDataRow(row1);
+      f.Model.AddDataRow(row2);
+      f.Model.AddDataRow(row3);
+
+      row1.AddValue(10);
+      row1.AddValue(5);
+      row1.AddValue(7);
+      row1.AddValue(3);
+      row1.AddValue(10);
+      row1.AddValue(2);
+
+      row2.AddValue(5);
+      row2.AddValue(6);
+      row2.AddValue(5);
+
+      row3.AddValue(2);
+      row3.AddValue(2);
+      row3.AddValue(2);
+      row3.AddValue(2);
+      row3.AddValue(2);
 
       f.ShowDialog();

trunk/sources/HeuristicLab.Visualization/CanvasUI.cs

@@ -2 +2 @@
 using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Drawing2D;
 using System.Windows.Forms;
 
@@ -26 +27 @@
         Graphics g = pe.Graphics;
 
+        g.SmoothingMode = SmoothingMode.AntiAlias;
+
         g.FillRectangle(Brushes.White, ClientRectangle);
 
@@ -36 +39 @@
        Debug.WriteLine(e);
       }
+    }
+
+    protected override void OnResize(EventArgs e) {
+      Invalidate();
+
+      base.OnResize(e);
     }
 

trunk/sources/HeuristicLab.Visualization/LineChart.Designer.cs

@@ -34 +34 @@
           // canvasUI1
           // 
-          this.canvasUI1.Location = new System.Drawing.Point(3, 3);
+          this.canvasUI1.Dock = System.Windows.Forms.DockStyle.Fill;
+          this.canvasUI1.Location = new System.Drawing.Point(0, 0);
           this.canvasUI1.MouseEventListener = null;
           this.canvasUI1.Name = "canvasUI1";
-          this.canvasUI1.Size = new System.Drawing.Size(546, 384);
+          this.canvasUI1.Size = new System.Drawing.Size(552, 390);
           this.canvasUI1.TabIndex = 0;
           this.canvasUI1.Text = "canvasUI1";

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -22 +22 @@
         throw new NullReferenceException("Model cannot be null.");
 
-      this.model = model;
-      this.Item = (IItem)model;
-
       //TODO: correct Rectangle to fit
       RectangleD clientRectangle = new RectangleD(-1, -1, 11, 11);
       canvasUI1.MainCanvas.WorldShape = new WorldShape(clientRectangle, clientRectangle);
+
+      this.model = model;
+      this.Item = (IItem)model;
     }
 
@@ -38 +38 @@
       model.DataRowRemoved += OnDataRowRemoved;
       model.ModelChanged += OnModelChanged;
+
+      foreach (IDataRow row in model.Rows) {
+        OnDataRowAdded(row);
+      }
     }
 
@@ -59 +63 @@
 
       for (int i = 1; i < row.Count; i++) {
-        LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], 0, row.Color);
+        LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], 0, row.Color, row.Thickness);
         lineShapes.Add(lineShape);
         canvasUI1.MainCanvas.WorldShape.AddShape(lineShape);
@@ -76 +80 @@
     private readonly IDictionary<IDataRow, List<LineShape>> rowToLineShapes = new Dictionary<IDataRow, List<LineShape>>();
 
-    private void OnRowValueChanged(IDataRow row, double value, int index) {
+    private void OnRowValueChanged(IDataRow row, double value, int index, Action action) {
       List<LineShape> lineShapes = rowToLineShapes[row];
 
@@ -84 +88 @@
       // new value was added
       if (index > 0 && index == lineShapes.Count+1) {
-        LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], 0, row.Color);
+        LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], 0, row.Color, row.Thickness);
         lineShapes.Add(lineShape);
         canvasUI1.MainCanvas.WorldShape.AddShape(lineShape);
@@ -94 +98 @@
 
       // not the last value
-      if (index > 0 && index < row.Count)
+      if (index > 0 && index < row.Count-1)
         lineShapes[index].Y1 = value;
 
@@ -100 +104 @@
     }
 
-    private void OnRowValuesChanged(IDataRow row, double[] values, int index) {
+    private void OnRowValuesChanged(IDataRow row, double[] values, int index, Action action) {
       foreach (double value in values) {
-        OnRowValueChanged(row, value, index++);
+        OnRowValueChanged(row, value, index++, action);
       }
     }

trunk/sources/HeuristicLab.Visualization/LineShape.cs

@@ -6 +6 @@
     private double z;
     private Color color;
+    private int thickness;
 
     /// <summary>
@@ -15 +16 @@
     /// <param name="y2">y coordinate of right lineEndPoind</param>
     /// <param name="color">color for the LineShape</param>
-    public LineShape(double x1, double y1, double x2, double y2, double z, Color color) {
+    public LineShape(double x1, double y1, double x2, double y2, double z, Color color, int thickness) {
       this.boundingBox = new RectangleD(x1, y1, x2, y2);
       this.z = z;
       this.color = color;
+      this.thickness = thickness;
     }
 
@@ -52 +54 @@
     /// <param name="clippingArea">rectangle in screen-coordinates to draw</param>
     public void Draw(Graphics graphics, Rectangle viewport, RectangleD clippingArea) {
-      using (Pen pen = new Pen(color, 3)){
+      using (Pen pen = new Pen(color, thickness)){
         Rectangle screenRect = Transform.ToScreen(boundingBox, viewport, clippingArea);
         graphics.DrawLine(pen,screenRect.Left, screenRect.Bottom, screenRect.Right, screenRect.Top);