Changeset 4636 for trunk/sources

Timestamp:

10/21/10 14:45:44 (14 years ago)

Author:

epitzer

Message:

More improvements to EnhancedChart (#1237)

• Fixed panning (now snaps to selected cursor interval)
• Changed chart type in DataTableView to EnhancedChart
• Added static method CustomizeChartArea()
• Changed CustomizeChartAreas() to CustomizeAllChartAreas()
• Disabled cursor cross hair
• Smaller title font

Location:

trunk/sources

Files:

• HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs (modified) (1 diff)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs

@@ -49 +49 @@
       System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
       System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
-      this.chart = new System.Windows.Forms.DataVisualization.Charting.Chart();
+      this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
       this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
       this.exportChartToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -70 +70 @@
       // chart
       // 
-      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.chart.BorderlineColor = System.Drawing.Color.Black;
       this.chart.BorderlineDashStyle = System.Windows.Forms.DataVisualization.Charting.ChartDashStyle.Solid;
@@ -85 +85 @@
       legend1.Name = "Legend1";
       this.chart.Legends.Add(legend1);
+      this.chart.EnableDoubleClickResetsZoom = true;
+      this.chart.EnableMiddleClickPanning = true;
       this.chart.Location = new System.Drawing.Point(0, 52);
       this.chart.Name = "chart";
@@ -139 +141 @@
     #endregion
 
-    private System.Windows.Forms.DataVisualization.Charting.Chart chart;
+    private HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart;
     private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
     private System.Windows.Forms.ToolStripMenuItem exportChartToolStripMenuItem;

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -56 +56 @@
       valuesRowsTable = new Dictionary<IObservableList<double>, DataRow>();
       invisibleSeries = new List<Series>();
+      chart.CustomizeAllChartAreas();
+      chart.ChartAreas[0].CursorX.Interval = 1;
     }
 

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -61 +61 @@
       colorButton.Image = this.GenerateImage(16, 16, this.colorDialog.Color);
       isSelecting = false;
-
-      chart.CustomizeChartAreas();
-      chart.EnableMiddleClickPanning = false;
-      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
-      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
+      chart.CustomizeAllChartAreas();
       chart.ChartAreas[0].CursorX.Interval = 1;
       chart.ChartAreas[0].CursorY.Interval = 1;

trunk/sources/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -31 +32 @@
       EnableDoubleClickResetsZoom = true;
       EnableMiddleClickPanning = true;
-      CustomizeChartAreas();
+      CustomizeAllChartAreas();
     }
 
@@ -39 +40 @@
     public bool EnableMiddleClickPanning { get; set; }
 
-    public void CustomizeChartAreas() {
+    public static void CustomizeChartArea(ChartArea chartArea) {
+      foreach (Axis axis in chartArea.Axes) {
+        axis.MajorGrid.LineColor = SystemColors.GradientInactiveCaption;
+        axis.MajorTickMark.TickMarkStyle = TickMarkStyle.AcrossAxis;
+        axis.ScrollBar.BackColor = Color.Transparent;
+        axis.ScrollBar.LineColor = Color.Transparent;
+        axis.ScrollBar.ButtonColor = SystemColors.GradientInactiveCaption;
+        axis.ScrollBar.ButtonStyle = ScrollBarButtonStyles.SmallScroll;
+        axis.ScrollBar.Size = 12;
+        axis.TitleFont = new Font(axis.TitleFont.FontFamily, 10);
+      }
+      chartArea.CursorX.Interval = 0;
+      chartArea.CursorY.Interval = 0;
+      chartArea.CursorX.IsUserSelectionEnabled = true;
+      chartArea.CursorY.IsUserSelectionEnabled = true;
+      chartArea.CursorX.IsUserEnabled = false;
+      chartArea.CursorY.IsUserEnabled = false;
+      chartArea.CursorX.SelectionColor = SystemColors.GradientActiveCaption;
+      chartArea.CursorY.SelectionColor = SystemColors.GradientActiveCaption;
+    }
+
+    public void CustomizeAllChartAreas() {
       foreach (ChartArea chartArea in ChartAreas) {
-        foreach (Axis axis in chartArea.Axes) {
-          axis.MajorGrid.LineColor = SystemColors.GradientInactiveCaption;
-          axis.MajorTickMark.TickMarkStyle = TickMarkStyle.AcrossAxis;
-          axis.ScrollBar.BackColor = Color.Transparent;
-          axis.ScrollBar.LineColor = Color.Transparent;
-          axis.ScrollBar.ButtonColor = SystemColors.GradientInactiveCaption;
-          axis.ScrollBar.ButtonStyle = ScrollBarButtonStyles.SmallScroll;
-          axis.ScrollBar.Size = 12;
-          axis.TitleFont = new Font(axis.TitleFont.FontFamily, 12);
-        }
-
-        chartArea.CursorX.Interval = 0;
-        chartArea.CursorY.Interval = 0;
-        chartArea.CursorX.IsUserSelectionEnabled = true;
-        chartArea.CursorY.IsUserSelectionEnabled = true;
-        chartArea.CursorX.SelectionColor = SystemColors.GradientActiveCaption;
-        chartArea.CursorY.SelectionColor = SystemColors.GradientActiveCaption;
+        CustomizeChartArea(chartArea);
       }
     }
@@ -122 +128 @@
     protected override void OnMouseMove(MouseEventArgs e) {
       if (panning != null) {
-        panning.ChartArea.AxisX.ScaleView.Scroll(panning.ChartX(e.Location.X));
-        panning.ChartArea.AxisY.ScaleView.Scroll(panning.ChartY(e.Location.Y));
+        double x = panning.ChartX(e.Location.X);
+        double y = panning.ChartY(e.Location.Y);
+        if (panning.ChartArea.CursorX.Interval > 0) {
+          x = Math.Round(x * panning.ChartArea.CursorX.Interval) / panning.ChartArea.CursorX.Interval;
+          y = Math.Round(y * panning.ChartArea.CursorY.Interval) / panning.ChartArea.CursorY.Interval;
+        }
+        panning.ChartArea.AxisX.ScaleView.Scroll(x);
+        panning.ChartArea.AxisY.ScaleView.Scroll(y);
       }
       base.OnMouseMove(e);