Changeset 3499 for trunk/sources/HeuristicLab.Optimization.Views/3.3

Timestamp:

04/22/10 22:23:55 (14 years ago)

Author:

mkommend

Message:

minor changes in RunCollectionBubbleChartView (ticket #970)

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• RunCollectionBubbleChartView.Designer.cs (modified) (1 diff)
• RunCollectionBubbleChartView.cs (modified) (5 diffs)

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

@@ -138 +138 @@
       this.sizeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.sizeComboBox.FormattingEnabled = true;
-      this.sizeComboBox.Location = new System.Drawing.Point(441, 3);
+      this.sizeComboBox.Location = new System.Drawing.Point(439, 3);
       this.sizeComboBox.Name = "sizeComboBox";
       this.sizeComboBox.Size = new System.Drawing.Size(121, 21);

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

@@ -141 +141 @@
       base.OnContentChanged();
       this.categoricalMapping.Clear();
-      this.UpdateComboBoxes();
+      UpdateComboBoxes();
+      UpdateDataPoints();
     }
     private void Content_ColumnNamesChanged(object sender, EventArgs e) {
@@ -154 +155 @@
       this.yAxisComboBox.Items.Clear();
       this.sizeComboBox.Items.Clear();
-      this.xAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
-      this.yAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
-      this.sizeComboBox.Items.Add(constantLabel);
-      this.sizeComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
+      if (Content != null) {
+        this.xAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
+        this.yAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
+        this.sizeComboBox.Items.Add(constantLabel);
+        this.sizeComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
+      }
     }
 
@@ -172 +175 @@
       Series series = this.chart.Series[0];
       series.Points.Clear();
-      foreach (IRun run in this.Content)
-        this.AddDataPoint(run);
+      if (Content != null) {
+        foreach (IRun run in this.Content)
+          this.AddDataPoint(run);
+      }
     }
     private void AddDataPoint(IRun run) {
@@ -358 +363 @@
     }
 
-    private string CreateTooltip(int runIndex) {
-      StringBuilder builder = new StringBuilder();
-      builder.AppendLine(this.Content.ElementAt(runIndex).Name);
-      int columnIndex = 0;
-      foreach (string columnName in Matrix.ColumnNames) {
-        builder.Append(columnName);
-        builder.Append(": ");
-        builder.AppendLine(Matrix.GetValue(runIndex, columnIndex));
-        columnIndex++;
-      }
-      return builder.ToString();
-    }
-
     private void zoomButton_CheckedChanged(object sender, EventArgs e) {
       this.isSelecting = selectButton.Checked;
@@ -377 +369 @@
       this.chart.ChartAreas[0].AxisY.ScaleView.Zoomable = !isSelecting;
     }
-
     private void colorButton_Click(object sender, EventArgs e) {
       if (colorDialog.ShowDialog(this) == DialogResult.OK) {