Changeset 6011 for branches/histogram/HeuristicLab.Analysis.Views/3.3

Timestamp:

04/15/11 14:54:43 (13 years ago)

Author:

abeham

Message:

#1465

• updated branch with changes from trunk
• fixed some bugs
• introduced secondary x-axis option

Location:

branches/histogram

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs (modified) (8 diffs)
• HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.cs (modified) (4 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (4 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.cs (modified) (1 diff)

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

@@ -57 +57 @@
       this.commonGroupBox = new System.Windows.Forms.GroupBox();
       this.histoGramGroupBox = new System.Windows.Forms.GroupBox();
+      this.secondXAxisCheckBox = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).BeginInit();
       this.commonGroupBox.SuspendLayout();
@@ -104 +105 @@
       this.startIndexZeroCheckBox.AutoSize = true;
       this.startIndexZeroCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
-      this.startIndexZeroCheckBox.Location = new System.Drawing.Point(17, 98);
+      this.startIndexZeroCheckBox.Location = new System.Drawing.Point(17, 121);
       this.startIndexZeroCheckBox.Name = "startIndexZeroCheckBox";
       this.startIndexZeroCheckBox.Size = new System.Drawing.Size(89, 17);
@@ -164 +165 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.commonGroupBox.Controls.Add(this.colorButton);
+      this.commonGroupBox.Controls.Add(this.secondXAxisCheckBox);
       this.commonGroupBox.Controls.Add(this.secondYAxisCheckBox);
       this.commonGroupBox.Controls.Add(this.label1);
@@ -171 +173 @@
       this.commonGroupBox.Location = new System.Drawing.Point(3, 3);
       this.commonGroupBox.Name = "commonGroupBox";
-      this.commonGroupBox.Size = new System.Drawing.Size(473, 122);
+      this.commonGroupBox.Size = new System.Drawing.Size(473, 142);
       this.commonGroupBox.TabIndex = 7;
       this.commonGroupBox.TabStop = false;
@@ -183 +185 @@
       this.histoGramGroupBox.Controls.Add(this.exactBinsCheckBox);
       this.histoGramGroupBox.Controls.Add(this.label3);
-      this.histoGramGroupBox.Location = new System.Drawing.Point(3, 131);
+      this.histoGramGroupBox.Location = new System.Drawing.Point(3, 151);
       this.histoGramGroupBox.Name = "histoGramGroupBox";
       this.histoGramGroupBox.Size = new System.Drawing.Size(473, 49);
@@ -190 +192 @@
       this.histoGramGroupBox.Text = "Histogram";
       // 
+      // secondXAxisCheckBox
+      // 
+      this.secondXAxisCheckBox.AutoSize = true;
+      this.secondXAxisCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
+      this.secondXAxisCheckBox.Location = new System.Drawing.Point(8, 98);
+      this.secondXAxisCheckBox.Name = "secondXAxisCheckBox";
+      this.secondXAxisCheckBox.Size = new System.Drawing.Size(98, 17);
+      this.secondXAxisCheckBox.TabIndex = 1;
+      this.secondXAxisCheckBox.Text = "Second X Axis:";
+      this.secondXAxisCheckBox.UseVisualStyleBackColor = true;
+      this.secondXAxisCheckBox.CheckedChanged += new System.EventHandler(this.secondXAxisCheckBox_CheckedChanged);
+      // 
       // DataRowVisualPropertiesControl
       // 
@@ -197 +211 @@
       this.Controls.Add(this.commonGroupBox);
       this.Name = "DataRowVisualPropertiesControl";
-      this.Size = new System.Drawing.Size(479, 185);
+      this.Size = new System.Drawing.Size(479, 205);
       ((System.ComponentModel.ISupportInitialize)(this.binsNumericUpDown)).EndInit();
       this.commonGroupBox.ResumeLayout(false);
@@ -221 +235 @@
     private System.Windows.Forms.GroupBox commonGroupBox;
     private System.Windows.Forms.GroupBox histoGramGroupBox;
+    private System.Windows.Forms.CheckBox secondXAxisCheckBox;
   }
 }

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

@@ -53 +53 @@
           colorButton.BackColor = SystemColors.Control;
           secondYAxisCheckBox.Checked = false;
+          secondXAxisCheckBox.Checked = false;
           startIndexZeroCheckBox.Checked = false;
           binsNumericUpDown.Value = 1;
@@ -58 +59 @@
         } else {
           chartTypeComboBox.SelectedItem = Content.ChartType;
-          colorButton.BackColor = Content.Color;
+          if (Content.Color.IsEmpty) {
+            colorButton.BackColor = SystemColors.Control;
+            colorButton.Text = "?";
+          } else colorButton.BackColor = Content.Color;
           secondYAxisCheckBox.Checked = Content.SecondYAxis;
+          secondXAxisCheckBox.Checked = Content.SecondXAxis;
           startIndexZeroCheckBox.Checked = Content.StartIndexZero;
           binsNumericUpDown.Value = Content.Bins;
@@ -85 +90 @@
         Content.Color = colorDialog.Color;
         colorButton.BackColor = Content.Color;
+        colorButton.Text = String.Empty;
       }
     }
@@ -91 +97 @@
       if (!SuppressEvents && Content != null) {
         Content.SecondYAxis = secondYAxisCheckBox.Checked;
+      }
+    }
+
+    private void secondXAxisCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (!SuppressEvents && Content != null) {
+        Content.SecondXAxis = secondXAxisCheckBox.Checked;
       }
     }

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

@@ -142 +142 @@
       }
       series.YAxisType = row.VisualProperties.SecondYAxis ? AxisType.Secondary : AxisType.Primary;
+      series.XAxisType = row.VisualProperties.SecondXAxis ? AxisType.Secondary : AxisType.Primary;
       if (row.VisualProperties.Color != Color.Empty) series.Color = row.VisualProperties.Color;
       series.ToolTip = row.Name + " X = #INDEX, Y = #VAL";
@@ -305 +306 @@
             chart.Series[row.Name].ChartType = SeriesChartType.Column;
             chart.Series[row.Name]["PointWidth"] = "1";
+            CalculateHistogram(chart.Series[row.Name], row);
             break;
           default:
@@ -311 +313 @@
         }
         chart.Series[row.Name].YAxisType = row.VisualProperties.SecondYAxis ? AxisType.Secondary : AxisType.Primary;
+        chart.Series[row.Name].XAxisType = row.VisualProperties.SecondXAxis ? AxisType.Secondary : AxisType.Primary;
         if (row.VisualProperties.Color != Color.Empty) chart.Series[row.Name].Color = row.VisualProperties.Color;
         chart.ChartAreas[0].RecalculateAxesScale();
@@ -444 +447 @@
 
     private void FillSeriesWithRowValues(Series series, DataRow row) {
-      if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram) {
-        series.Points.Clear();
-        if (!row.Values.Any()) return;
-        int bins = row.VisualProperties.Bins;
-
-        double minValue = row.Values.Min();
-        double maxValue = row.Values.Max();
-        double intervalWidth = (maxValue - minValue) / bins;
-        if (intervalWidth <= 0) return;
-
-        if (!row.VisualProperties.ExactBins) {
-          intervalWidth = HumanRoundRange(intervalWidth);
-          minValue = Math.Floor(minValue / intervalWidth) * intervalWidth;
-          maxValue = Math.Ceiling(maxValue / intervalWidth) * intervalWidth;
-        }
-
-        double current = minValue, intervalCenter = intervalWidth / 2.0;
-        int frequency = 0;
-        foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) {
-          while (v > current + intervalWidth) {
-            series.Points.AddXY(current + intervalCenter, frequency);
-            current += intervalWidth;
-            frequency = 0;
-          }
-          frequency++;
-        }
-        series.Points.AddXY(current + intervalCenter, frequency);
-      } else {
-        for (int i = 0; i < row.Values.Count; i++) {
-          var value = row.Values[i];
-          DataPoint point = new DataPoint();
-          point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
-          if (IsInvalidValue(value))
-            point.IsEmpty = true;
-          else
-            point.YValues = new double[] { value };
-          series.Points.Add(point);
-        }
-      }
+      switch (row.VisualProperties.ChartType) {
+        case DataRowVisualProperties.DataRowChartType.Histogram:
+          CalculateHistogram(series, row);
+          break;
+        default: {
+            for (int i = 0; i < row.Values.Count; i++) {
+              var value = row.Values[i];
+              DataPoint point = new DataPoint();
+              point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
+              if (IsInvalidValue(value))
+                point.IsEmpty = true;
+              else
+                point.YValues = new double[] { value };
+              series.Points.Add(point);
+            }
+          }
+          break;
+      }
+    }
+
+    private void CalculateHistogram(Series series, DataRow row) {
+      series.Points.Clear();
+      if (!row.Values.Any()) return;
+      int bins = row.VisualProperties.Bins;
+
+      double minValue = row.Values.Min();
+      double maxValue = row.Values.Max();
+      double intervalWidth = (maxValue - minValue) / bins;
+      if (intervalWidth <= 0) return;
+
+      if (!row.VisualProperties.ExactBins) {
+        intervalWidth = HumanRoundRange(intervalWidth);
+        minValue = Math.Floor(minValue / intervalWidth) * intervalWidth;
+        maxValue = Math.Ceiling(maxValue / intervalWidth) * intervalWidth;
+      }
+
+      double current = minValue, intervalCenter = intervalWidth / 2.0;
+      int frequency = 0;
+      foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) {
+        while (v > current + intervalWidth) {
+          series.Points.AddXY(current + intervalCenter, frequency);
+          current += intervalWidth;
+          frequency = 0;
+        }
+        frequency++;
+      }
+      series.Points.AddXY(current + intervalCenter, frequency);
     }
 

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

@@ -64 +64 @@
     private void cancelButton_Click(object sender, System.EventArgs e) {
       DialogResult = DialogResult.Cancel;
-      Content.VisualProperties = originalDataTableVPs;
       foreach (DataRow row in Content.Rows) {
         row.VisualProperties = originalDataRowVPs[row.Name];
       }
+      Content.VisualProperties = originalDataTableVPs;
       Close();
     }