Changeset 3524

Timestamp:

04/25/10 16:27:17 (14 years ago)

Author:

mkommend

Message:

implemented reviewer comments (ticket #970)

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• RunCollectionBubbleChartView.Designer.cs (modified) (9 diffs)
• RunCollectionBubbleChartView.cs (modified) (7 diffs)

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

@@ -63 +63 @@
       this.xJitterlabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.xJitterlabel.AutoSize = true;
-      this.xJitterlabel.Location = new System.Drawing.Point(460, 308);
+      this.xJitterlabel.Location = new System.Drawing.Point(569, 308);
       this.xJitterlabel.Name = "xJitterlabel";
       this.xJitterlabel.Size = new System.Drawing.Size(32, 13);
@@ -72 +72 @@
       // 
       this.xTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-      this.xTrackBar.Location = new System.Drawing.Point(498, 305);
+      this.xTrackBar.Location = new System.Drawing.Point(607, 305);
       this.xTrackBar.Maximum = 100;
       this.xTrackBar.Name = "xTrackBar";
@@ -84 +84 @@
       this.xAxisLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.xAxisLabel.AutoSize = true;
-      this.xAxisLabel.Location = new System.Drawing.Point(211, 307);
+      this.xAxisLabel.Location = new System.Drawing.Point(320, 307);
       this.xAxisLabel.Name = "xAxisLabel";
       this.xAxisLabel.Size = new System.Drawing.Size(15, 13);
@@ -96 +96 @@
       this.xAxisComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.xAxisComboBox.FormattingEnabled = true;
-      this.xAxisComboBox.Location = new System.Drawing.Point(232, 305);
+      this.xAxisComboBox.Location = new System.Drawing.Point(341, 305);
       this.xAxisComboBox.Name = "xAxisComboBox";
       this.xAxisComboBox.Size = new System.Drawing.Size(221, 21);
@@ -138 +138 @@
       this.sizeComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.sizeComboBox.FormattingEnabled = true;
-      this.sizeComboBox.Location = new System.Drawing.Point(439, 3);
+      this.sizeComboBox.Location = new System.Drawing.Point(448, 3);
       this.sizeComboBox.Name = "sizeComboBox";
-      this.sizeComboBox.Size = new System.Drawing.Size(121, 21);
+      this.sizeComboBox.Size = new System.Drawing.Size(221, 21);
       this.sizeComboBox.TabIndex = 14;
       this.sizeComboBox.SelectedIndexChanged += new System.EventHandler(this.AxisComboBox_SelectedIndexChanged);
@@ -148 +148 @@
       this.sizeLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.sizeLabel.AutoSize = true;
-      this.sizeLabel.Location = new System.Drawing.Point(369, 6);
+      this.sizeLabel.Location = new System.Drawing.Point(378, 6);
       this.sizeLabel.Name = "sizeLabel";
       this.sizeLabel.Size = new System.Drawing.Size(66, 13);
       this.sizeLabel.TabIndex = 15;
       this.sizeLabel.Text = "Bubble Size:";
+      this.sizeLabel.Click += new System.EventHandler(this.sizeLabel_Click);
       // 
       // chart
@@ -165 +166 @@
       series1.ChartArea = "ChartArea1";
       series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Bubble;
-      series1.CustomProperties = "BubbleMaxSize=0";
+      series1.CustomProperties = "BubbleMinSize=2, BubbleMaxSize=7";
       series1.IsVisibleInLegend = false;
       series1.MarkerStyle = System.Windows.Forms.DataVisualization.Charting.MarkerStyle.Circle;
@@ -171 +172 @@
       series1.YValuesPerPoint = 2;
       this.chart.Series.Add(series1);
-      this.chart.Size = new System.Drawing.Size(554, 261);
+      this.chart.Size = new System.Drawing.Size(663, 261);
       this.chart.TabIndex = 16;
-      this.chart.Text = "chart1";
+      this.chart.Text = "chart";
       this.chart.MouseUp += new System.Windows.Forms.MouseEventHandler(this.chart_MouseUp);
       this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
@@ -252 +253 @@
       this.Controls.Add(this.yTrackBar);
       this.Name = "RunCollectionBubbleChartView";
-      this.Size = new System.Drawing.Size(565, 332);
+      this.Size = new System.Drawing.Size(674, 332);
       ((System.ComponentModel.ISupportInitialize)(this.xTrackBar)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.yTrackBar)).EndInit();

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

@@ -39 +39 @@
   [Content(typeof(RunCollection), false)]
   public partial class RunCollectionBubbleChartView : AsynchronousContentView {
-    private const string constantLabel = "constant";
+    private enum SizeDimension { Constant = 0 }
+    private enum AxisDimension { Index = 0 }
+
     private Dictionary<int, Dictionary<object, double>> categoricalMapping;
     private Dictionary<IRun, double> xJitter;
@@ -59 +61 @@
       this.colorButton.Image = this.GenerateImage(16, 16, this.colorDialog.Color);
       this.isSelecting = false;
-
-      this.chart.Series[0]["BubbleMaxSize"] = "0";
-      this.chart.Series[0]["BubbleMaxScale"] = "Auto";
-      this.chart.Series[0]["BubbleMinScale"] = "Auto";
-      this.chart.Series[0].SmartLabelStyle.Enabled = true;
-      this.chart.Series[0].SmartLabelStyle.IsMarkerOverlappingAllowed = false;
-      this.chart.Series[0].SmartLabelStyle.IsOverlappedHidden = true;
 
       this.chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
@@ -156 +151 @@
       this.sizeComboBox.Items.Clear();
       if (Content != null) {
+        string[] additionalAxisDimension = Enum.GetNames(typeof(AxisDimension));
+        this.xAxisComboBox.Items.AddRange(additionalAxisDimension);
         this.xAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
+        this.yAxisComboBox.Items.AddRange(additionalAxisDimension);
         this.yAxisComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
-        this.sizeComboBox.Items.Add(constantLabel);
+        string[] additionalSizeDimension = Enum.GetNames(typeof(SizeDimension));
+        this.sizeComboBox.Items.AddRange(additionalSizeDimension);
         this.sizeComboBox.Items.AddRange(Matrix.ColumnNames.ToArray());
+        this.sizeComboBox.SelectedItem = SizeDimension.Constant.ToString();
       }
     }
@@ -186 +186 @@
       Series series = this.chart.Series[0];
       int row = this.Content.ToList().IndexOf(run);
-      xValue = GetValue(row, xAxisComboBox.SelectedIndex);
-      yValue = GetValue(row, yAxisComboBox.SelectedIndex);
-      sizeValue = 1.0;
+      xValue = GetValue(run, (string)xAxisComboBox.SelectedItem);
+      yValue = GetValue(run, (string)yAxisComboBox.SelectedItem);
       if (xValue.HasValue && yValue.HasValue) {
-        if (sizeComboBox.SelectedIndex > 0)
-          sizeValue = GetValue(row, sizeComboBox.SelectedIndex - 1);
+       sizeValue = GetValue(run, (string)sizeComboBox.SelectedItem);
         xValue = xValue.Value + xValue.Value * GetXJitter(Content.ElementAt(row)) * xJitterFactor;
         yValue = yValue.Value + yValue.Value * GetYJitter(Content.ElementAt(row)) * yJitterFactor;
@@ -202 +200 @@
       }
     }
-    private double? GetValue(int row, int column) {
-      if (column < 0 || row < 0)
+    private double? GetValue(IRun run, string columnName) {
+      if (run == null || string.IsNullOrEmpty(columnName))
         return null;
 
-      IItem value = Content.GetValue(row, column);
-      DoubleValue doubleValue = value as DoubleValue;
-      IntValue intValue = value as IntValue;
-      double ret;
-
-      if (doubleValue != null)
-        ret = doubleValue.Value;
-      else if (intValue != null)
-        ret = intValue.Value;
-      else
-        ret = GetCategoricalValue(column, Matrix.GetValue(row, column));
-
-      return ret;
-    }
-    private double GetCategoricalValue(int dimension, object c) {
+      if (Enum.IsDefined(typeof(AxisDimension), columnName)) {
+        AxisDimension axisDimension = (AxisDimension)Enum.Parse(typeof(AxisDimension), columnName);
+        return GetValue(run, axisDimension);
+      } else if (Enum.IsDefined(typeof(SizeDimension), columnName)) {
+        SizeDimension sizeDimension = (SizeDimension)Enum.Parse(typeof(SizeDimension), columnName);
+        return GetValue(run, sizeDimension);
+      } else {
+        int columnIndex = Matrix.ColumnNames.ToList().IndexOf(columnName);
+        IItem value = Content.GetValue(run, columnIndex);
+        if (value == null)
+          return null;
+
+        DoubleValue doubleValue = value as DoubleValue;
+        IntValue intValue = value as IntValue;
+        double ret;
+        if (doubleValue != null)
+          ret = doubleValue.Value;
+        else if (intValue != null)
+          ret = intValue.Value;
+        else
+          ret = GetCategoricalValue(columnIndex, value.ToString());
+
+        return ret;
+      }
+    }
+    private double GetCategoricalValue(int dimension, string value) {
       if (!this.categoricalMapping.ContainsKey(dimension))
         this.categoricalMapping[dimension] = new Dictionary<object, double>();
-      if (!this.categoricalMapping[dimension].ContainsKey(c)) {
+      if (!this.categoricalMapping[dimension].ContainsKey(value)) {
         if (this.categoricalMapping[dimension].Values.Count == 0)
-          this.categoricalMapping[dimension][c] = 1.0;
+          this.categoricalMapping[dimension][value] = 1.0;
         else
-          this.categoricalMapping[dimension][c] = this.categoricalMapping[dimension].Values.Max() + 1.0;
-      }
-      return this.categoricalMapping[dimension][c];
-    }
-
-    #region drag and drop
+          this.categoricalMapping[dimension][value] = this.categoricalMapping[dimension].Values.Max() + 1.0;
+      }
+      return this.categoricalMapping[dimension][value];
+    }
+    private double GetValue(IRun run, AxisDimension axisDimension) {
+      double value = double.NaN;
+      switch (axisDimension) {
+        case AxisDimension.Index: {
+            value = Content.ToList().IndexOf(run);
+            break;
+          }
+        default: {
+            throw new ArgumentException("No handling strategy for " + axisDimension.ToString() + " is defined.");
+          }
+      }
+      return value;
+    }
+    private double GetValue(IRun run, SizeDimension sizeDimension) {
+      double value = double.NaN;
+      switch (sizeDimension) {
+        case SizeDimension.Constant: {
+            value = 2;
+            break;
+          }
+        default: {
+            throw new ArgumentException("No handling strategy for " + sizeDimension.ToString() + " is defined.");
+          }
+      }
+      return value;
+    }
+
+    #region drag and drop and tooltip
     private IRun draggedRun;
     private void chart_MouseDown(object sender, MouseEventArgs e) {
@@ -306 +341 @@
         }
       }
-      string newTooltipText;
+      string newTooltipText = string.Empty;
       string oldTooltipText;
       if (h.ChartElementType == ChartElementType.DataPoint) {
         IRun run = (IRun)((DataPoint)h.Object).Tag;
-        newTooltipText = run.Name + System.Environment.NewLine;
-        newTooltipText += xAxisComboBox.SelectedItem + " : " + Content.GetValue(run, xAxisComboBox.SelectedIndex).ToString() + Environment.NewLine;
-        newTooltipText += yAxisComboBox.SelectedItem + " : " + Content.GetValue(run, yAxisComboBox.SelectedIndex).ToString() + Environment.NewLine; ;
-      } else
-        newTooltipText = string.Empty;
+        newTooltipText = BuildTooltip(run);
+      }
+
       oldTooltipText = this.tooltip.GetToolTip(chart);
       if (newTooltipText != oldTooltipText)
         this.tooltip.SetToolTip(chart, newTooltipText);
+    }
+
+    private string BuildTooltip(IRun run) {
+      string tooltip;
+      tooltip = run.Name + System.Environment.NewLine;
+
+      double? xValue = this.GetValue(run, (string)xAxisComboBox.SelectedItem);
+      double? yValue = this.GetValue(run, (string)yAxisComboBox.SelectedItem);
+      double? sizeValue = this.GetValue(run, (string)sizeComboBox.SelectedItem);
+
+      string xString = xValue == null ? string.Empty : xValue.Value.ToString();
+      string yString = yValue == null ? string.Empty : yValue.Value.ToString();
+      string sizeString = sizeValue == null ? string.Empty : sizeValue.Value.ToString();
+
+      tooltip += xAxisComboBox.SelectedItem + " : " + xString + Environment.NewLine;
+      tooltip += yAxisComboBox.SelectedItem + " : " + yString + Environment.NewLine;
+      tooltip += sizeComboBox.SelectedItem + " : " + sizeString + Environment.NewLine;
+
+      return tooltip;
     }
     #endregion
@@ -384 +436 @@
     }
     #endregion
+
+    private void sizeLabel_Click(object sender, EventArgs e) {
+
+    }
   }
 }