Changeset 1233 for trunk/sources/HeuristicLab.Visualization/LineChart.cs

Timestamp:

02/28/09 21:21:59 (15 years ago)

Author:

mstoeger

Message:

General housekeeping (#498) Removed some old unused Z-Order values. Replaced some var types by concrete types. Renamed some LineShape properties. Added caching of Pens and Brushes in LineShape and RectangleShape. Put axis tick calculation algorithm into its own class.

File:

• trunk/sources/HeuristicLab.Visualization/LineChart.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Drawing2D;
 using System.Windows.Forms;
 using HeuristicLab.Core;
+using HeuristicLab.Visualization.Legend;
 using HeuristicLab.Visualization.Options;
 
@@ -65 +65 @@
       root.AddShape(titleShape);
 
-      minMaxLineShape = new MinMaxLineShape(this.minDataValue, this.maxDataValue, 0, Color.Yellow, 4, DrawingStyle.Solid);
+      minMaxLineShape = new MinMaxLineShape(this.minDataValue, this.maxDataValue, Color.Yellow, 4, DrawingStyle.Solid);
       root.AddShape(minMaxLineShape);
 
@@ -207 +207 @@
       }
       for (int i = 1; i < row.Count; i++) {
-        LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], 0, row.Color, row.Thickness, row.Style);
+        LineShape lineShape = new LineShape(i - 1, row[i - 1], i, row[i], row.Color, row.Thickness, row.Style);
         lineShapes.Add(lineShape);
         // TODO each DataRow needs its own WorldShape so Y Axes can be zoomed independently.
@@ -246 +246 @@
           maxDataRowCount = row.Count;
         }
-        LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], 0, row.Color, row.Thickness,
+        LineShape lineShape = new LineShape(index - 1, row[index - 1], index, row[index], row.Color, row.Thickness,
                                             row.Style);
         lineShapes.Add(lineShape);
@@ -412 +412 @@
 
     private void optionsToolStripMenuItem_Click(object sender, EventArgs e) {
-      var optionsdlg = new OptionsDialog(this);
-      optionsdlg.Show();
+      OptionsDialog optionsdlg = new OptionsDialog(this);
+      optionsdlg.ShowDialog(this);
     }
 
     public void ApplyChangesToRow(IDataRow row) {
-      foreach (var ls in rowToLineShapes[row]) {
+      foreach (LineShape ls in rowToLineShapes[row]) {
         ls.LSColor = row.Color;
         ls.LSThickness = row.Thickness;
-        if (row.Style == DrawingStyle.Dashed) {
-          ls.LSDashStyle = DashStyle.Dash;
-        }
-        else {
-          ls.LSDashStyle = DashStyle.Solid; //default
-        }
+        ls.LSDrawingStyle = row.Style;
       }
       canvas.Invalidate();