Changeset 9267 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

03/01/13 15:05:12 (11 years ago)

Author:

abeham

Message:

#2008: fixed remaining issues (view is readonly, matrix is not sortable, categorical values are displayed in the cells)

File:

• trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs (modified) (3 diffs)

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

@@ -724 +724 @@
     private void getDataAsMatrixToolStripMenuItem_Click(object sender, EventArgs e) {
       int xCol = Matrix.ColumnNames.ToList().IndexOf(xAxisValue);
+      int yCol = Matrix.ColumnNames.ToList().IndexOf(yAxisValue);
+
       var grouped = new Dictionary<string, List<string>>();
       Dictionary<double, string> reverseMapping = null;
@@ -730 +732 @@
       foreach (var run in Content.Where(r => r.Visible)) {
         var x = GetValue(run, xAxisValue);
-        var y = GetValue(run, yAxisValue);
-        if (!(x.HasValue && y.HasValue)) continue;
+        object y;
+        if (categoricalMapping.ContainsKey(yCol))
+          y = Content.GetValue(run, yAxisValue);
+        else y = GetValue(run, yAxisValue);
+        if (!(x.HasValue && y != null)) continue;
 
         var category = reverseMapping == null ? x.Value.ToString() : reverseMapping[x.Value];
         if (!grouped.ContainsKey(category)) grouped[category] = new List<string>();
-        grouped[category].Add(y.Value.ToString());
+        grouped[category].Add(y.ToString());
       }
 
@@ -749 +754 @@
         i++;
       }
-
-      MainFormManager.MainForm.ShowContent(matrix);
+      matrix.SortableView = false;
+      var view = MainFormManager.MainForm.ShowContent(matrix);
+      view.ReadOnly = true;
     }
     #endregion