Changeset 1343 for trunk

Timestamp:

03/13/09 19:18:21 (16 years ago)

Author:

mstoeger

Message:

Display of Y-Axes can be individually switched on and off in the options dialog. (#433)

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/LineChartTests.cs (modified) (1 diff)
• HeuristicLab.Visualization/AvgAggregator.cs (modified) (1 diff)
• HeuristicLab.Visualization/AvgLineAggregator.cs (modified) (1 diff)
• HeuristicLab.Visualization/DataRow.cs (modified) (2 diffs)
• HeuristicLab.Visualization/IDataRow.cs (modified) (1 diff)
• HeuristicLab.Visualization/LineChart.cs (modified) (4 diffs)
• HeuristicLab.Visualization/MaxAggregator.cs (modified) (1 diff)
• HeuristicLab.Visualization/MinAggregator.cs (modified) (1 diff)
• HeuristicLab.Visualization/Options/OptionsDialog.Designer.cs (modified) (6 diffs)
• HeuristicLab.Visualization/Options/OptionsDialog.cs (modified) (2 diffs)
• HeuristicLab.Visualization/YAxis.cs (modified) (2 diffs)

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

@@ -81 +81 @@
       row1.Thickness = 3;
       row1.Style = DrawingStyle.Solid;
+      row1.Label = "Die Rote";
 
       row2.Color = Color.Green;
       row2.Thickness = 3;
       row2.Style = DrawingStyle.Solid;
+      row2.Label = "Die Grüne";
 
       model.AddDataRow(row1);

trunk/sources/HeuristicLab.Visualization/AvgAggregator.cs

@@ -110 +110 @@
     }
 
+    private bool showYAxis = false;
+
+    public bool ShowYAxis {
+      get { return showYAxis; }
+      set {
+        showYAxis = value;
+        OnDataRowChanged(this);
+      }
+    }
+
     public LabelProvider.ILabelProvider YAxisLabelProvider {
       get {

trunk/sources/HeuristicLab.Visualization/AvgLineAggregator.cs

@@ -124 +124 @@
     }
 
+
+    private bool showYAxis = false;
+
+    public bool ShowYAxis {
+      get { return showYAxis; }
+      set {
+        showYAxis = value;
+        OnDataRowChanged(this);
+      }
+    }
+
     public LabelProvider.ILabelProvider YAxisLabelProvider {
       get {

trunk/sources/HeuristicLab.Visualization/DataRow.cs

@@ -83 +83 @@
       }
     }
-
   
     public string Label {
@@ -114 +113 @@
       set {
         style = value;
+        OnDataRowChanged(this);
+      }
+    }
+
+    private bool showYAxis = true;
+
+    public virtual bool ShowYAxis {
+      get { return showYAxis; }
+      set {
+        showYAxis = value;
         OnDataRowChanged(this);
       }

trunk/sources/HeuristicLab.Visualization/IDataRow.cs

@@ -14 +14 @@
     DrawingStyle Style { get; set; }
     DataRowType LineType { get; set; }
+ 
+    bool ShowYAxis { get; set; }
     ILabelProvider YAxisLabelProvider { get; set; }
 

trunk/sources/HeuristicLab.Visualization/LineChart.cs

@@ -109 +109 @@
       canvas.AddShape(xAxis);
 
-      foreach (RowEntry rowEntry in rowEntries) {
-        canvas.AddShape(rowEntry.YAxis);
+      int yAxesWidth = 0;
+
+      foreach (RowEntry rowEntry in rowEntries) {
+        if (rowEntry.DataRow.ShowYAxis) {
+          canvas.AddShape(rowEntry.YAxis);
+          yAxesWidth += YAxisWidth;
+        }
       }
 
@@ -120 +125 @@
       titleShape.X = 10;
       titleShape.Y = canvasUI.Height - 10;
-
-      int yAxesWidth = 0;
-
-      foreach (RowEntry rowEntry in rowEntries) {
-        if (rowEntry.YAxis.Visible) {
-          yAxesWidth += YAxisWidth;
-        }
-      }
 
       RectangleD linesAreaBoundingBox = new RectangleD(yAxesWidth,
@@ -141 +138 @@
       int yAxisLeft = 0;
       foreach (RowEntry rowEntry in rowEntries) {
-        rowEntry.YAxis.BoundingBox = new RectangleD(yAxisLeft,
-                                                    linesAreaBoundingBox.Y1,
-                                                    yAxisLeft + YAxisWidth,
-                                                    linesAreaBoundingBox.Y2);
-        yAxisLeft += YAxisWidth;
+        if (rowEntry.DataRow.ShowYAxis) {
+          rowEntry.YAxis.BoundingBox = new RectangleD(yAxisLeft,
+                                                      linesAreaBoundingBox.Y1,
+                                                      yAxisLeft + YAxisWidth,
+                                                      linesAreaBoundingBox.Y2);
+          yAxisLeft += YAxisWidth;
+        }
       }
 
@@ -206 +205 @@
 
       rowEntry.LinesShape.UpdateStyle(row);
+
+      UpdateLayout();
 
       canvasUI.Invalidate();

trunk/sources/HeuristicLab.Visualization/MaxAggregator.cs

@@ -113 +113 @@
     }
 
+    private bool showYAxis = false;
+
+    public bool ShowYAxis {
+      get { return showYAxis; }
+      set {
+        showYAxis = value;
+        OnDataRowChanged(this);
+      }
+    }
+
     public LabelProvider.ILabelProvider YAxisLabelProvider {
       get {

trunk/sources/HeuristicLab.Visualization/MinAggregator.cs

@@ -112 +112 @@
     }
 
+
+    private bool showYAxis = false;
+
+    public bool ShowYAxis {
+      get { return showYAxis; }
+      set {
+        showYAxis = value;
+        OnDataRowChanged(this);
+      }
+    }
+
     private ILabelProvider labelProvider = new ContinuousLabelProvider("0.##");
     public ILabelProvider YAxisLabelProvider {

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

@@ -48 +48 @@
       this.tpXAxis = new System.Windows.Forms.TabPage();
       this.btnChangeXAxisFont = new System.Windows.Forms.Button();
+      this.tpYAxes = new System.Windows.Forms.TabPage();
+      this.dataRowsFlowLayout = new System.Windows.Forms.FlowLayoutPanel();
       this.tpTitle.SuspendLayout();
       this.tabPage2.SuspendLayout();
@@ -54 +56 @@
       this.Optionstabs.SuspendLayout();
       this.tpXAxis.SuspendLayout();
+      this.tpYAxes.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -274 +277 @@
       this.Optionstabs.Controls.Add(this.tpTitle);
       this.Optionstabs.Controls.Add(this.tpXAxis);
+      this.Optionstabs.Controls.Add(this.tpYAxes);
       this.Optionstabs.Location = new System.Drawing.Point(0, 1);
       this.Optionstabs.Name = "Optionstabs";
@@ -299 +303 @@
       this.btnChangeXAxisFont.UseVisualStyleBackColor = true;
       this.btnChangeXAxisFont.Click += new System.EventHandler(this.btnChangeXAxisFont_Click);
+      // 
+      // tpYAxes
+      // 
+      this.tpYAxes.Controls.Add(this.dataRowsFlowLayout);
+      this.tpYAxes.Location = new System.Drawing.Point(4, 22);
+      this.tpYAxes.Name = "tpYAxes";
+      this.tpYAxes.Padding = new System.Windows.Forms.Padding(3);
+      this.tpYAxes.Size = new System.Drawing.Size(284, 199);
+      this.tpYAxes.TabIndex = 4;
+      this.tpYAxes.Text = "Y-Axes";
+      this.tpYAxes.UseVisualStyleBackColor = true;
+      // 
+      // dataRowsFlowLayout
+      // 
+      this.dataRowsFlowLayout.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.dataRowsFlowLayout.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+      this.dataRowsFlowLayout.Location = new System.Drawing.Point(3, 3);
+      this.dataRowsFlowLayout.Name = "dataRowsFlowLayout";
+      this.dataRowsFlowLayout.Size = new System.Drawing.Size(278, 193);
+      this.dataRowsFlowLayout.TabIndex = 0;
       // 
       // OptionsDialog
@@ -323 +347 @@
       this.Optionstabs.ResumeLayout(false);
       this.tpXAxis.ResumeLayout(false);
+      this.tpYAxes.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -353 +378 @@
     private System.Windows.Forms.TabPage tpXAxis;
     private System.Windows.Forms.Button btnChangeXAxisFont;
+    private System.Windows.Forms.TabPage tpYAxes;
+    private System.Windows.Forms.FlowLayoutPanel dataRowsFlowLayout;
   }
 }

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

@@ -23 +23 @@
 
     public IList<int> GetThicknesses() {
-      return new List<int> {0, 1, 2, 3, 4, 5, 6, 7, 8};
+      return new List<int>(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8});
     }
 
     public IList<DrawingStyle> GetStyles() {
-      return new List<DrawingStyle> {DrawingStyle.Solid, DrawingStyle.Dashed};
+      return new List<DrawingStyle>(new DrawingStyle[] {DrawingStyle.Solid, DrawingStyle.Dashed});
     }
 
@@ -39 +39 @@
         LineSelectCB.SelectedIndex = 0;
         LineSelectCB_SelectedIndexChanged(this, null);
+      }
+
+      InitTabPageYAxes();
+    }
+
+    private void InitTabPageYAxes() {
+      for (int i = 0; i < model.Rows.Count; i++) {
+        IDataRow row = model.Rows[i];
+
+        CheckBox chkbox = new CheckBox();
+        chkbox.Text = row.Label;
+        chkbox.Checked = row.ShowYAxis;
+        chkbox.CheckedChanged += delegate { row.ShowYAxis = chkbox.Checked; };
+        
+        dataRowsFlowLayout.Controls.Add(chkbox);
       }
     }

trunk/sources/HeuristicLab.Visualization/YAxis.cs

@@ -7 +7 @@
 
     private ILabelProvider labelProvider = new ContinuousLabelProvider("e4");
-    private bool visible = true;
 
     public ILabelProvider LabelProvider {
@@ -14 +13 @@
     }
 
-    public bool Visible {
-      get { return visible; }
-      set { visible = value; }
-    }
-
     public override void Draw(Graphics graphics) {
       ClearShapes();
 
-      if (Visible) {
-        foreach (double y in AxisTicks.GetTicks(PixelsPerInterval, Parent.Viewport.Height,
-                                                ClippingArea.Height,
-                                                ClippingArea.Y1)) {
-          TextShape label = new TextShape(ClippingArea.X2 - 3, y,
-                                          labelProvider.GetLabel(y));
-          label.AnchorPositionX = AnchorPositionX.Right;
-          label.AnchorPositionY = AnchorPositionY.Middle;
-          AddShape(label);
-        }
+      foreach (double y in AxisTicks.GetTicks(PixelsPerInterval, Parent.Viewport.Height,
+                                              ClippingArea.Height,
+                                              ClippingArea.Y1)) {
+        TextShape label = new TextShape(ClippingArea.X2 - 3, y,
+                                        labelProvider.GetLabel(y));
+        label.AnchorPositionX = AnchorPositionX.Right;
+        label.AnchorPositionY = AnchorPositionY.Middle;
+        AddShape(label);
       }