From: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Date: Fri, 15 Apr 2016 17:45:57 +0000 (-0400)
Subject: analysis: Add count column to latency statistics view
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8f6e9344761d970ceaa96e8cd426c169b5b0bb64;p=deliverable%2Ftracecompass.git

analysis: Add count column to latency statistics view

Change-Id: Id2db373022a6c1b78ddac2a6c7b580459c189f3a
Signed-off-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/70895
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Hudson CI
---

diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java
index 30cfda37f7..775fd3f369 100644
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/AbstractSegmentStoreStatisticsViewer.java
@@ -52,7 +52,8 @@ public abstract class AbstractSegmentStoreStatisticsViewer extends AbstractTmfTr
             checkNotNull(Messages.SegmentStoreStatistics_Statistics_MinLabel),
             checkNotNull(Messages.SegmentStoreStatistics_MaxLabel),
             checkNotNull(Messages.SegmentStoreStatistics_AverageLabel),
-            checkNotNull(Messages.SegmentStoreStatisticsViewer_StandardDeviation)
+            checkNotNull(Messages.SegmentStoreStatisticsViewer_StandardDeviation),
+            checkNotNull(Messages.SegmentStoreStatisticsViewer_Count)
     };
 
     /**
@@ -90,6 +91,8 @@ public abstract class AbstractSegmentStoreStatisticsViewer extends AbstractTmfTr
                         value = String.valueOf(toFormattedString(entry.getEntry().getAverage()));
                     } else if (columnIndex == 4) {
                         value = String.valueOf(toFormattedString(entry.getEntry().getStdDev()));
+                    } else if (columnIndex == 5) {
+                        value = String.valueOf(entry.getEntry().getNbSegments());
                     }
                 }
             }
@@ -208,6 +211,23 @@ public abstract class AbstractSegmentStoreStatisticsViewer extends AbstractTmfTr
                     }
                 });
                 columns.add(column);
+                column = new TmfTreeColumnData(COLUMN_NAMES[5]);
+                column.setAlignment(SWT.RIGHT);
+                column.setComparator(new ViewerComparator() {
+                    @Override
+                    public int compare(@Nullable Viewer viewer, @Nullable Object e1, @Nullable Object e2) {
+                        if ((e1 == null) || (e2 == null)) {
+                            return 0;
+                        }
+
+                        SegmentStoreStatisticsEntry n1 = (SegmentStoreStatisticsEntry) e1;
+                        SegmentStoreStatisticsEntry n2 = (SegmentStoreStatisticsEntry) e2;
+
+                        return Long.compare(n1.getEntry().getNbSegments(), n2.getEntry().getNbSegments());
+
+                    }
+                });
+                columns.add(column);
                 column = new TmfTreeColumnData(""); //$NON-NLS-1$
                 columns.add(column);
                 return columns;
diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/Messages.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/Messages.java
index 9752956a28..b18ddbee66 100644
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/Messages.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/Messages.java
@@ -32,6 +32,9 @@ public class Messages extends NLS {
     public static String SegmentStoreStatistics_MaxLabel;
     /** Name of average column */
     public static String SegmentStoreStatistics_AverageLabel;
+    /** Name of count column */
+    public static String SegmentStoreStatisticsViewer_Count;
+
     /** Name of average column */
     public static String SegmentStoreStatisticsViewer_StandardDeviation;
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/messages.properties b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/messages.properties
index 61c5df5f20..682eb7b5dd 100644
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/messages.properties
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/analysis/timing/ui/views/segmentstore/statistics/messages.properties
@@ -13,4 +13,5 @@ SegmentStoreStatistics_LevelLabel=Level
 SegmentStoreStatistics_Statistics_MinLabel=Minimum
 SegmentStoreStatistics_MaxLabel=Maximum
 SegmentStoreStatistics_AverageLabel=Average
+SegmentStoreStatisticsViewer_Count=Count
 SegmentStoreStatisticsViewer_StandardDeviation=Standard Deviation
\ No newline at end of file