lami.chart: use formatter on x axis for continuous data type

Swt bar chart use categories instead of tick simply format categories
label while constructing the map.

Change-Id: I80bbf0b06a65e716a4ae87b06bc0731bb827c6dc
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Reviewed-on: https://git.eclipse.org/r/79577
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Alexandre Montplaisir <alexmonthy@efficios.com>
Tested-by: Alexandre Montplaisir <alexmonthy@efficios.com>

diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/viewers/LamiBarChartViewer.java b/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/viewers/LamiBarChartViewer.java
index 0795713fea5121611ecfa628d6afe261e40f8122..a79404332ae0e2c9bebf02e9647ec90731e69440 100644 (file)
--- a/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/viewers/LamiBarChartViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.lami.ui/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/viewers/LamiBarChartViewer.java
@@ -12,6 +12,7 @@ package org.eclipse.tracecompass.internal.provisional.analysis.lami.ui.viewers;
 import static org.eclipse.tracecompass.common.core.NonNullUtils.checkNotNull;
 
 import java.math.BigDecimal;
+import java.text.Format;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -119,6 +120,11 @@ public class LamiBarChartViewer extends LamiXYChartViewer {
         fEntryToCategoriesMap = new HashMap<>();
 
         /* Categories index mapping */
+        Format formatter = null;
+        if (xAxisAspect.isContinuous()) {
+            formatter = getContinuousAxisFormatter(xAxisAspects, entries, null, null);
+        }
+
         List<@Nullable String> xCategories = new ArrayList<>();
         for (int i = 0; i < entries.size(); i++) {
             String string = xAxisAspect.resolveString(entries.get(i));
@@ -126,7 +132,12 @@ public class LamiBarChartViewer extends LamiXYChartViewer {
                 fEntryToCategoriesMap.put(entries.get(i), new Mapping(null, i));
                 continue;
             }
+
             fEntryToCategoriesMap.put(entries.get(i), new Mapping(xCategories.size(), i));
+            if (formatter != null) {
+                string = formatter.format(xAxisAspect.resolveNumber(entries.get(i)));
+            }
+
             xCategories.add(string);
 
         }