X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng%2Forg.eclipse.tracecompass.lttng2.ust.ui%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Finternal%2Flttng2%2Fust%2Fui%2Fviews%2Fmemusage%2FMemoryUsageViewer.java;h=7df090489275c44012b159d6aa9289a120bca95d;hb=61c1650ede24f5d0566131f96e9509022e608c40;hp=ff3cf944a9216c8b088fcd33273f0f2298b24add;hpb=25033fefb1d755a3fdedf3eeafaa4fbc951fba69;p=deliverable%2Ftracecompass.git

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
index ff3cf944a9..7df0904892 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui/src/org/eclipse/tracecompass/internal/lttng2/ust/ui/views/memusage/MemoryUsageViewer.java
@@ -21,6 +21,7 @@ import java.util.Map;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.tracecompass.common.core.format.DataSizeWithUnitFormat;
 import org.eclipse.tracecompass.internal.lttng2.ust.core.analysis.memory.UstMemoryStrings;
 import org.eclipse.tracecompass.internal.tmf.core.Activator;
 import org.eclipse.tracecompass.lttng2.ust.core.analysis.memory.UstMemoryAnalysisModule;
@@ -34,6 +35,7 @@ import org.eclipse.tracecompass.tmf.core.statesystem.TmfStateSystemAnalysisModul
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
 import org.eclipse.tracecompass.tmf.ui.viewers.xycharts.linecharts.TmfCommonXLineChartViewer;
+import org.swtchart.Chart;
 
 /**
  * Memory usage view
@@ -49,8 +51,6 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
     private final Map<Integer, Integer> fMemoryQuarks = new HashMap<>();
     private final Map<Integer, String> fSeriesName = new HashMap<>();
 
-    private static final int BYTES_TO_KB = 1024;
-
     // Timeout between updates in the updateData thread
     private static final long BUILD_UPDATE_TIMEOUT = 500;
 
@@ -62,6 +62,8 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
      */
     public MemoryUsageViewer(Composite parent) {
         super(parent, Messages.MemoryUsageViewer_Title, Messages.MemoryUsageViewer_XAxis, Messages.MemoryUsageViewer_YAxis);
+        Chart chart = getSwtChart();
+        chart.getAxisSet().getYAxis(0).getTick().setFormat(new DataSizeWithUnitFormat());
     }
 
     @Override
@@ -154,7 +156,7 @@ public class MemoryUsageViewer extends TmfCommonXLineChartViewer {
                         double[] values = checkNotNull(fYValues.get(quark));
                         try {
                             Integer memQuark = checkNotNull(fMemoryQuarks.get(quark));
-                            yvalue = ss.querySingleState(time, memQuark.intValue()).getStateValue().unboxLong() / BYTES_TO_KB;
+                            yvalue = ss.querySingleState(time, memQuark.intValue()).getStateValue().unboxLong();
                             values[i] = yvalue;
                         } catch (TimeRangeException e) {
                             values[i] = 0;