Changeset 1876 for trunk

Timestamp:

05/23/09 08:28:50 (16 years ago)

Author:

mstoeger

Message:

x-axis grid can be enabled/disabled #629

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/3.2/LineChartTests.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/ChartDataRowsModel.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj (modified) (2 diffs)
• HeuristicLab.Visualization/3.2/IChartDataRowsModel.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/LineChart.cs (modified) (7 diffs)
• HeuristicLab.Visualization/3.2/Options/Options.Designer.cs (modified) (5 diffs)
• HeuristicLab.Visualization/3.2/Options/Options.cs (modified) (4 diffs)
• HeuristicLab.Visualization/3.2/XAxisGrid.cs (added)
• HeuristicLab.Visualization/3.2/YAxisGrid.cs (moved) (moved from trunk/sources/HeuristicLab.Visualization/3.2/Grid.cs) (2 diffs)

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

@@ -130 +130 @@
       };
 
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestGridX() {
+      LineChartTestForm f = new LineChartTestForm(model);
+      IDataRow row1 = new DataRow();
+      model.AddDataRow(row1);
+
+      model.ShowXAxisGrid = false;
+
+      Random rand = new Random(42);
+      for (int i = 0; i < 10; i++) {
+        row1.AddValue(rand.NextDouble() * 10);
+      }
       f.ShowDialog();
     }

trunk/sources/HeuristicLab.Visualization/3.2/ChartDataRowsModel.cs

@@ -17 +17 @@
     private string xAxisLabel = "";
     private bool showXAxisLabel = true;
+    private bool showXAxisGrid = true;
     private ILabelProvider labelProvider = new ContinuousLabelProvider("0.##");
 
     private ViewSettings viewSettings = new ViewSettings();
+
+    public bool ShowXAxisGrid {
+      get { return showXAxisGrid; }
+      set {
+        this.showXAxisGrid = value;
+        OnModelChanged();
+      }
+    }
 
     public ILabelProvider XAxisLabelProvider {

trunk/sources/HeuristicLab.Visualization/3.2/HeuristicLab.Visualization-3.2.csproj

@@ -115 +115 @@
     <Compile Include="LabelProvider\ContinuousLabelProvider.cs" />
     <Compile Include="LabelProvider\DiscreteLabelProvider.cs" />
-    <Compile Include="Grid.cs" />
+    <Compile Include="YAxisGrid.cs" />
     <Compile Include="HorizontalLineShape.cs" />
     <Compile Include="LabelProvider\ILabelProvider.cs" />
@@ -164 +164 @@
     <Compile Include="WorldShape.cs" />
     <Compile Include="XAxis.cs" />
+    <Compile Include="XAxisGrid.cs" />
     <Compile Include="YAxis.cs" />
     <Compile Include="YAxisDescriptor.cs" />

trunk/sources/HeuristicLab.Visualization/3.2/IChartDataRowsModel.cs

@@ -21 +21 @@
     string XAxisLabel { get; set; }
     bool ShowXAxisLabel { get; set; }
+    bool ShowXAxisGrid { get; set; }
 
     event ModelChangedHandler ModelChanged;

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

@@ -18 +18 @@
     private readonly LegendShape legendShape = new LegendShape();
     private readonly XAxis xAxis = new XAxis();
+    private readonly XAxisGrid xAxisGrid = new XAxisGrid();
     private readonly List<RowEntry> rowEntries = new List<RowEntry>();
 
@@ -87 +88 @@
 
       titleShape.Text = model.Title;
+
+      if (model.ShowXAxisGrid) {
+        canvas.AddShape(xAxisGrid);
+      }
 
       foreach (YAxisDescriptor yAxisDescriptor in model.YAxes) {
@@ -144 +149 @@
         rowEntry.LinesShape.BoundingBox = linesAreaBoundingBox;
       }
+
+      xAxisGrid.BoundingBox = linesAreaBoundingBox;
 
       foreach (YAxisDescriptor yAxisDescriptor in model.YAxes) {
@@ -348 +355 @@
 
     private void SetClipX(double x1, double x2) {
+      xAxisGrid.ClippingArea = new RectangleD(x1,
+                                              xAxisGrid.ClippingArea.Y1,
+                                              x2,
+                                              xAxisGrid.ClippingArea.Y2);
+
       xAxis.ClippingArea = new RectangleD(x1,
                                           0,
@@ -374 +386 @@
 
     private void SetClipY(RowEntry rowEntry, double y1, double y2) {
+      xAxisGrid.ClippingArea = new RectangleD(xAxisGrid.ClippingArea.X1,
+                                              y1,
+                                              xAxisGrid.ClippingArea.X2,
+                                              y2);
+
       rowEntry.LinesShape.ClippingArea = new RectangleD(rowEntry.LinesShape.ClippingArea.X1,
                                                         y1,
@@ -469 +486 @@
 
     private void OnModelChanged() {
+      UpdateLayout();
       canvasUI.Invalidate();
     }
@@ -671 +689 @@
 
     private class YAxisInfo {
-      private readonly Grid grid = new Grid();
+      private readonly YAxisGrid grid = new YAxisGrid();
       private readonly YAxis yAxis = new YAxis();
 
-      public Grid Grid {
+      public YAxisGrid Grid {
         get { return grid; }
       }

trunk/sources/HeuristicLab.Visualization/3.2/Options/Options.Designer.cs

@@ -53 +53 @@
       this.flpShowYAxis = new System.Windows.Forms.FlowLayoutPanel();
       this.fdFont = new System.Windows.Forms.FontDialog();
+      this.chkShowXAxisGrid = new System.Windows.Forms.CheckBox();
       this.Optionstabs.SuspendLayout();
       this.tabPage1.SuspendLayout();
@@ -286 +287 @@
       // tpXAxis
       // 
+      this.tpXAxis.Controls.Add(this.chkShowXAxisGrid);
       this.tpXAxis.Controls.Add(this.btnChangeXAxisFont);
       this.tpXAxis.Location = new System.Drawing.Point(4, 22);
@@ -357 +359 @@
       this.flpShowYAxis.Size = new System.Drawing.Size(275, 57);
       this.flpShowYAxis.TabIndex = 0;
+      // 
+      // chkShowXAxisGrid
+      // 
+      this.chkShowXAxisGrid.AutoSize = true;
+      this.chkShowXAxisGrid.Location = new System.Drawing.Point(3, 32);
+      this.chkShowXAxisGrid.Name = "chkShowXAxisGrid";
+      this.chkShowXAxisGrid.Size = new System.Drawing.Size(107, 17);
+      this.chkShowXAxisGrid.TabIndex = 3;
+      this.chkShowXAxisGrid.Text = "Show X-Axis Grid";
+      this.chkShowXAxisGrid.UseVisualStyleBackColor = true;
+      this.chkShowXAxisGrid.CheckedChanged += new System.EventHandler(this.chkShowXAxisGrid_CheckedChanged);
       // 
       // Options
@@ -376 +389 @@
       this.tpTitle.PerformLayout();
       this.tpXAxis.ResumeLayout(false);
+      this.tpXAxis.PerformLayout();
       this.tpYAxes.ResumeLayout(false);
       this.tpYAxes.PerformLayout();
@@ -415 +429 @@
     private System.Windows.Forms.FlowLayoutPanel flpShowYAxis;
     private System.Windows.Forms.FontDialog fdFont;
+    private System.Windows.Forms.CheckBox chkShowXAxisGrid;
     private System.Windows.Forms.TextBox tbxTitle;
     private System.Windows.Forms.Label label5;

trunk/sources/HeuristicLab.Visualization/3.2/Options/Options.cs

@@ -13 +13 @@
     private string oldTitle;
     private Dictionary<CheckBox, bool> ShowYAxisBoxes;
+    private bool oldShowXAxisGrid;
     private Dictionary<CheckBox, bool> yAxisClipChangeableBoxes;
 
@@ -65 +66 @@
 
     public void ResetSettings() {
+      model.ShowXAxisGrid = oldShowXAxisGrid;
+
       foreach (var param in oldLineParams) {
         param.applySettings();
@@ -150 +153 @@
 
     private void Options_Load(object sender, EventArgs e) {
+      oldShowXAxisGrid = model.ShowXAxisGrid;
+      chkShowXAxisGrid.Checked = model.ShowXAxisGrid;
+
       InitTabPageLines();
       InitTabPageYAxes();
@@ -238 +244 @@
     }
 
+    private void chkShowXAxisGrid_CheckedChanged(object sender, EventArgs e) {
+      model.ShowXAxisGrid = chkShowXAxisGrid.Checked;
+    }
+
     private void tbxTitle_TextChanged(object sender, EventArgs e) {
       model.Title = tbxTitle.Text;

trunk/sources/HeuristicLab.Visualization/3.2/YAxisGrid.cs

@@ -2 +2 @@
 
 namespace HeuristicLab.Visualization {
-  public class Grid : WorldShape {
+  public class YAxisGrid : WorldShape {
     private Color color = Color.LightBlue;
 
@@ -14 +14 @@
         LineShape line = new LineShape(ClippingArea.X1, y,
                                        ClippingArea.X2, y,
-                                       color, 1,
-                                       DrawingStyle.Dashed);
-        AddShape(line);
-      }
-
-      foreach (double x in AxisTicks.GetTicks(XAxis.PixelsPerInterval,
-                                              Parent.Viewport.Width,
-                                              ClippingArea.Width,
-                                              ClippingArea.X1)) {
-        LineShape line = new LineShape(x, ClippingArea.Y1,
-                                       x, ClippingArea.Y2,
                                        color, 1,
                                        DrawingStyle.Dashed);