Changeset 5970 for branches

Timestamp:

04/06/11 18:37:47 (14 years ago)

Author:

abeham

Message:

#1465

• Separated HistogramView into a view and a control
• Added the HistogramControl to ChartControlsExtensions (not yet userfriendly)

Location:

branches/histogram

Files:

• HeuristicLab.Analysis.Views/3.3/HistogramView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Analysis.Views/3.3/HistogramView.cs (modified) (3 diffs)
• HeuristicLab.Analysis.Views/3.3/HistogramView.resx (modified) (1 diff)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj (modified) (1 diff)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.Designer.cs (added)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/HistogramControl.cs (added)

branches/histogram/HeuristicLab.Analysis.Views/3.3/HistogramView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-      System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
-      this.enhancedChart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
-      this.label1 = new System.Windows.Forms.Label();
-      this.numericUpDown = new System.Windows.Forms.NumericUpDown();
+      this.histogramControl = new HeuristicLab.Visualization.ChartControlsExtensions.HistogramControl();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
-      ((System.ComponentModel.ISupportInitialize)(this.enhancedChart)).BeginInit();
-      ((System.ComponentModel.ISupportInitialize)(this.numericUpDown)).BeginInit();
       this.SuspendLayout();
       // 
@@ -66 +60 @@
       this.infoLabel.Location = new System.Drawing.Point(524, 3);
       // 
-      // enhancedChart
+      // histogramControl
       // 
-      this.enhancedChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      this.histogramControl.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)));
-      chartArea1.Name = "ChartArea1";
-      this.enhancedChart.ChartAreas.Add(chartArea1);
-      this.enhancedChart.Location = new System.Drawing.Point(0, 52);
-      this.enhancedChart.Name = "enhancedChart";
-      series1.ChartArea = "ChartArea1";
-      series1.Name = "Series1";
-      this.enhancedChart.Series.Add(series1);
-      this.enhancedChart.Size = new System.Drawing.Size(543, 320);
-      this.enhancedChart.TabIndex = 3;
-      // 
-      // label1
-      // 
-      this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(3, 28);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(82, 13);
-      this.label1.TabIndex = 4;
-      this.label1.Text = "Number of Bins:";
-      // 
-      // numericUpDown
-      // 
-      this.numericUpDown.Location = new System.Drawing.Point(91, 26);
-      this.numericUpDown.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-      this.numericUpDown.Name = "numericUpDown";
-      this.numericUpDown.Size = new System.Drawing.Size(61, 20);
-      this.numericUpDown.TabIndex = 5;
-      this.numericUpDown.Value = new decimal(new int[] {
-            10,
-            0,
-            0,
-            0});
-      this.numericUpDown.ValueChanged += new System.EventHandler(this.numericUpDown_ValueChanged);
+      this.histogramControl.Location = new System.Drawing.Point(0, 26);
+      this.histogramControl.Name = "histogramControl";
+      this.histogramControl.Size = new System.Drawing.Size(543, 346);
+      this.histogramControl.TabIndex = 3;
       // 
       // HistogramView
@@ -112 +74 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.enhancedChart);
-      this.Controls.Add(this.numericUpDown);
-      this.Controls.Add(this.label1);
+      this.Controls.Add(this.histogramControl);
       this.Name = "HistogramView";
       this.Size = new System.Drawing.Size(543, 372);
-      this.Controls.SetChildIndex(this.label1, 0);
-      this.Controls.SetChildIndex(this.numericUpDown, 0);
-      this.Controls.SetChildIndex(this.enhancedChart, 0);
+      this.Controls.SetChildIndex(this.histogramControl, 0);
       this.Controls.SetChildIndex(this.nameLabel, 0);
       this.Controls.SetChildIndex(this.nameTextBox, 0);
       this.Controls.SetChildIndex(this.infoLabel, 0);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
-      ((System.ComponentModel.ISupportInitialize)(this.enhancedChart)).EndInit();
-      ((System.ComponentModel.ISupportInitialize)(this.numericUpDown)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -133 +89 @@
     #endregion
 
-    private Visualization.ChartControlsExtensions.EnhancedChart enhancedChart;
-    private System.Windows.Forms.Label label1;
-    private System.Windows.Forms.NumericUpDown numericUpDown;
+    private Visualization.ChartControlsExtensions.HistogramControl histogramControl;
+
   }
 }

branches/histogram/HeuristicLab.Analysis.Views/3.3/HistogramView.cs

@@ -20 +20 @@
 #endregion
 
-using System.Drawing;
-using System.Linq;
 using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
 using HeuristicLab.Collections;
 using HeuristicLab.Core.Views;
@@ -59 +56 @@
     #region Event Handlers (Content)
     private void Content_Values_ItemsAdded(object sender, CollectionItemsChangedEventArgs<double> e) {
-      UpdateChartSettings();
+      histogramControl.AddPoints(e.Items);
     }
     private void Content_Values_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<double> e) {
-      InitializeChart();
+      histogramControl.ClearPoints();
+      histogramControl.AddPoints(Content.Values);
     }
     private void Content_Values_CollectionReset(object sender, CollectionItemsChangedEventArgs<double> e) {
-      InitializeChart();
+      histogramControl.ClearPoints();
+      histogramControl.AddPoints(Content.Values);
     }
     #endregion
@@ -72 +71 @@
       base.OnContentChanged();
       if (Content == null) {
-        enhancedChart.Series.Clear();
+        histogramControl.ClearPoints();
       } else {
-        InitializeChart();
+        histogramControl.AddPoints(Content.Values);
       }
     }
 
-    private void InitializeChart() {
-      enhancedChart.Series.Clear();
-      UpdateChartSettings();
-    }
-
-    private void UpdateChartSettings() {
-      if (Content == null || Content.Values.Count < 1) return;
-
-      int bins = (int)numericUpDown.Value;
-      string histogramSeriesName = "Histogram";
-
-      Series histogramSeries = null;
-      if (enhancedChart.Series.IndexOf(histogramSeriesName) < 0) {
-        histogramSeries = enhancedChart.Series.Add(histogramSeriesName);
-
-        histogramSeries.ChartType = SeriesChartType.Column;
-        histogramSeries.BorderColor = Color.Black;
-        histogramSeries.BorderWidth = 1;
-        histogramSeries.BorderDashStyle = ChartDashStyle.Solid;
-      } else {
-        histogramSeries = enhancedChart.Series[histogramSeriesName];
-        histogramSeries.Points.Clear();
-      }
-
-      double minValue = Content.Values.Min();
-      double maxValue = Content.Values.Max();
-      double intervalWidth = (maxValue - minValue) / bins;
-
-      double current = minValue;
-      int count = 0;
-      foreach (double v in Content.Values.OrderBy(x => x)) {
-        if (v < current + intervalWidth) {
-          count++;
-        } else {
-          histogramSeries.Points.AddXY(current + intervalWidth / 2.0, count);
-          count = 0;
-          current += intervalWidth;
-        }
-      }
-
-      histogramSeries["PointWidth"] = "1";
-
-      ChartArea chartArea = enhancedChart.ChartAreas[histogramSeries.ChartArea];
-      chartArea.AxisY.Title = "Frequency";
-      chartArea.AxisX.Minimum = minValue;
-      chartArea.AxisX.Maximum = maxValue;
-
-      double axisInterval = intervalWidth;
-      while ((maxValue - minValue) / axisInterval > 10.0) {
-        axisInterval *= 2.0;
-      }
-      chartArea.AxisX.Interval = axisInterval;
-    }
-
-
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      enhancedChart.Enabled = Content != null;
+      histogramControl.Enabled = Content != null;
     }
 
     #region Event Handlers (child controls)
-    private void numericUpDown_ValueChanged(object sender, System.EventArgs e) {
-      UpdateChartSettings();
-    }
     #endregion
   }

branches/histogram/HeuristicLab.Analysis.Views/3.3/HistogramView.resx

@@ -121 +121 @@
     <value>107, 17</value>
   </metadata>
-  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>107, 17</value>
-  </metadata>
   <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>

branches/histogram/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj

@@ -122 +122 @@
     </Compile>
     <Compile Include="HeuristicLabVisualizationChartControlsExtensionsPlugin.cs" />
+    <Compile Include="HistogramControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="HistogramControl.Designer.cs">
+      <DependentUpon>HistogramControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>