Changeset 1038 for trunk/sources/HeuristicLab.Visualization.Test

Timestamp:

12/18/08 23:17:23 (15 years ago)

Author:

mstoeger

Message:

Modified the XAxis labels so they are always visible at the bottom. (#433)
Added simple layout management to the line chart's root shape containing a title-, lines- and xaxis-area. (#345)

Location:

trunk/sources/HeuristicLab.Visualization.Test

Files:

• LineChartTestForm.Designer.cs (modified) (5 diffs)
• LineChartTestForm.cs (modified) (2 diffs)
• LineChartTests.cs (modified) (5 diffs)
• MainForm.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Visualization.Test/LineChartTestForm.Designer.cs

@@ -26 +26 @@
       this.lineChartGroupBox = new System.Windows.Forms.GroupBox();
       this.btnResetView = new System.Windows.Forms.Button();
+      this.btnAddRandomValue = new System.Windows.Forms.Button();
       this.SuspendLayout();
       // 
@@ -35 +36 @@
       this.lineChartGroupBox.Location = new System.Drawing.Point(12, 12);
       this.lineChartGroupBox.Name = "lineChartGroupBox";
-      this.lineChartGroupBox.Size = new System.Drawing.Size(607, 318);
+      this.lineChartGroupBox.Size = new System.Drawing.Size(673, 376);
       this.lineChartGroupBox.TabIndex = 0;
       this.lineChartGroupBox.TabStop = false;
@@ -43 +44 @@
       // 
       this.btnResetView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.btnResetView.Location = new System.Drawing.Point(544, 346);
+      this.btnResetView.Location = new System.Drawing.Point(610, 404);
       this.btnResetView.Name = "btnResetView";
       this.btnResetView.Size = new System.Drawing.Size(75, 23);
@@ -51 +52 @@
       this.btnResetView.Click += new System.EventHandler(this.btnResetView_Click);
       // 
+      // btnAddRandomValue
+      // 
+      this.btnAddRandomValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.btnAddRandomValue.Location = new System.Drawing.Point(529, 404);
+      this.btnAddRandomValue.Name = "btnAddRandomValue";
+      this.btnAddRandomValue.Size = new System.Drawing.Size(75, 23);
+      this.btnAddRandomValue.TabIndex = 2;
+      this.btnAddRandomValue.Text = "Add Value";
+      this.btnAddRandomValue.UseVisualStyleBackColor = true;
+      this.btnAddRandomValue.Click += new System.EventHandler(this.btnAddRandomValue_Click);
+      // 
       // LineChartTestForm
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(631, 395);
+      this.ClientSize = new System.Drawing.Size(697, 453);
+      this.Controls.Add(this.btnAddRandomValue);
       this.Controls.Add(this.lineChartGroupBox);
       this.Controls.Add(this.btnResetView);
@@ -68 +81 @@
     private System.Windows.Forms.GroupBox lineChartGroupBox;
     private System.Windows.Forms.Button btnResetView;
+    private System.Windows.Forms.Button btnAddRandomValue;
 
   }

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

@@ -1 @@
-using System.Windows.Forms;
+using System;
+using System.Windows.Forms;
 using HeuristicLab.Core;
 
 namespace HeuristicLab.Visualization.Test {
   public partial class LineChartTestForm : Form {
+    private readonly IView view;
     private ChartDataRowsModel model;
-    private IView view;
 
     public LineChartTestForm() {
       InitializeComponent();
+    }
 
-      model = new ChartDataRowsModel();
-
-      
+    public LineChartTestForm(ChartDataRowsModel model) : this() {
+      this.model = model;
       view = model.CreateView();
 
@@ -21 +22 @@
     }
 
-    public ChartDataRowsModel Model {
-      get { return model; }
+    private void btnResetView_Click(object sender, EventArgs e) {
+      if (view != null) {
+        LineChart lineChart = (LineChart)view;
+        lineChart.ResetView();
+      }
     }
 
-    private void btnResetView_Click(object sender, System.EventArgs e) {
-      LineChart lineChart = (LineChart)view;
-      lineChart.ResetView();
+    private void btnAddRandomValue_Click(object sender, EventArgs e) {
+      Random rand = new Random();
+
+      foreach (IDataRow row in model.Rows)
+        row.AddValue(rand.NextDouble()*100);
     }
   }

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

@@ -6 +6 @@
   [TestFixture]
   public class LineChartTests {
+    private ChartDataRowsModel model;
+
+    [SetUp]
+    public void SetUp() {
+      model = new ChartDataRowsModel();
+    }
+
     [Test]
     public void TestLineChart() {
-      LineChartTestForm f = new LineChartTestForm();
+      LineChartTestForm f = new LineChartTestForm(model);
 
       IDataRow row1 = new DataRow();
@@ -27 +34 @@
       
 
-      f.Model.AddDataRow(row1);
-      f.Model.AddDataRow(row2);
-      f.Model.AddDataRow(row3);
+      model.AddDataRow(row1);
+      model.AddDataRow(row2);
+      model.AddDataRow(row3);
 
       row1.AddValue(10);
@@ -50 +57 @@
       Random rand = new Random();
 
-      for (int i = 0; i < 1000; i++) {
+      for (int i = 0; i < 10000; i++) {
         row1.AddValue(rand.NextDouble()*10);
         row2.AddValue(rand.NextDouble()*10);
@@ -61 +68 @@
     [Test]
     public void TestAxes() {
-      LineChartTestForm f = new LineChartTestForm();
+      LineChartTestForm f = new LineChartTestForm(model);
 
       IDataRow row1 = new DataRow();
@@ -69 +76 @@
       row1.Style = DrawingStyle.Solid;
 
-      f.Model.AddDataRow(row1);
+      model.AddDataRow(row1);
 
       row1.AddValue(10);

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

@@ -30 +30 @@
       WorldShape mainWorld = canvasUI.MainCanvas.WorldShape;
       // simple rectangle shape
-      RectangleShape rect7 = new RectangleShape(5, 5, 50, 50, 0, Color.Black);
+      RectangleShape rect7 = new RectangleShape(5, 5, 50, 50, Color.Black);
       mainWorld.AddShape(rect7);
     }
@@ -43 +43 @@
 
       for (int i = 0; i < 10000; i++) {
-        RectangleShape rect = new RectangleShape(x1, y1, x1 + 0.3, y1 + 0.3, 0, Color.Maroon);
+        RectangleShape rect = new RectangleShape(x1, y1, x1 + 0.3, y1 + 0.3, Color.Maroon);
         x1 += 0.4;
         y1 += 0.4;
@@ -57 +57 @@
       CompositeShape middleComp = new CompositeShape();
 
-      RectangleShape rect5 = new RectangleShape(400, 10, 500, 300, 0, Color.Navy);
-      RectangleShape rect6 = new RectangleShape(510, 310, 580, 590, 0, Color.Magenta);
+      RectangleShape rect5 = new RectangleShape(400, 10, 500, 300, Color.Navy);
+      RectangleShape rect6 = new RectangleShape(510, 310, 580, 590, Color.Magenta);
 
       middleComp.AddShape(rect5);
@@ -71 +71 @@
       WorldShape leftWorld = new WorldShape(new RectangleD(0, 0, 1000, 1000), new RectangleD(10, 10, 380, 590));
 
-      RectangleShape fillRect = new RectangleShape(0, 0, 1000, 1000, 0, Color.LightBlue);
+      RectangleShape fillRect = new RectangleShape(0, 0, 1000, 1000, Color.LightBlue);
 
-      RectangleShape rect1 = new RectangleShape(100, 100, 500, 500, 0, Color.Red);
-      RectangleShape rect2 = new RectangleShape(800, -200, 1200, 500, 0, Color.Green);
+      RectangleShape rect1 = new RectangleShape(100, 100, 500, 500, Color.Red);
+      RectangleShape rect2 = new RectangleShape(800, -200, 1200, 500, Color.Green);
 
       CompositeShape comp1 = new CompositeShape();
 
-      RectangleShape rect3 = new RectangleShape(510, 580, 590, 700, 0, Color.Blue);
-      RectangleShape rect4 = new RectangleShape(600, 710, 800, 900, 0, Color.Orange);
+      RectangleShape rect3 = new RectangleShape(510, 580, 590, 700, Color.Blue);
+      RectangleShape rect4 = new RectangleShape(600, 710, 800, 900, Color.Orange);
 
       comp1.AddShape(rect3);