Changeset 12595

Timestamp:

07/06/15 11:32:59 (4 years ago)

Author:

pfleck

Message:

#2379 Fixed wrong keys for categorical mapping.

File:

• branches/BubbleChart/HeuristicLab.Optimization.BubbleChart/3.3/BubbleChartView.cs (modified) (7 diffs)

branches/BubbleChart/HeuristicLab.Optimization.BubbleChart/3.3/BubbleChartView.cs

@@ -200 +200 @@
                   series.Points.Add(new DataPoint(x, new[] { y, s }));
             }
-
           }
         }
@@ -216 +215 @@
           return parent.Children
             .Where(child => child.Data.ContainsKey(dataKey))
-            .Select(child => ConvertToDouble(child.Data[dataKey], child, dataKey));
+            .Select(child => ConvertToDouble(child, dataKey));
         }
         return Enumerable.Empty<double>();
@@ -231 +230 @@
           return GetValue(item, sizeDimension).ToEnumerable();
         } else if (item.Data.ContainsKey(key)) {
-          IItem value = item.Data[key];
-          return ConvertToDouble(value, item, key).ToEnumerable();
+
+          return ConvertToDouble(item, key).ToEnumerable();
         } else {
           return Enumerable.Empty<double>();
@@ -239 +238 @@
     }
 
-    private double ConvertToDouble(IItem value, RecursiveDataItem item, string key) {
+    private double ConvertToDouble(RecursiveDataItem item, string key) {
+      IItem value = item.Data[key];
       var doubleValue = value as DoubleValue;
       var intValue = value as IntValue;
@@ -252 +252 @@
         ret = timeSpanValue.Value.TotalSeconds;
       else
-        ret = GetCategoricalValue(item, key, value.ToString());
+        ret = GetCategoricalValue(key, value.ToString());
       return ret.Value;
     }
 
-    private double? GetCategoricalValue(RecursiveDataItem item, string key, string value) {
+    private double? GetCategoricalValue(string key, string value) {
       if (!categoricalMapping.ContainsKey(key)) {
         categoricalMapping[key] = new Dictionary<object, double>();
@@ -322 +322 @@
     }
     private void SetCustomAxisLabels(Axis axis, string key) {
+      if (key == null) return;
+      var tokens = key.Split(new[] { Separator }, StringSplitOptions.RemoveEmptyEntries);
+      if (tokens.Length == 2)
+        key = tokens[1];
       axis.CustomLabels.Clear();
-      if (key != null && categoricalMapping.ContainsKey(key)) {
+      if (categoricalMapping.ContainsKey(key)) {
         foreach (var pair in categoricalMapping[key]) {
           string labelText = pair.Key.ToString();
@@ -336 +340 @@
           axis.CustomLabels.Add(label);
         }
-      } else if (false && key != null && Content.Data[key] is TimeSpanValue) { // TODO
+      } else if (Content.Data.ContainsKey(key) && Content.Data[key] is TimeSpanValue) { // TODO
         chart.ChartAreas[0].RecalculateAxesScale();
         for (double i = axis.Minimum; i <= axis.Maximum; i += axis.LabelStyle.Interval) {