From cd9408581c2e0e2f0f67316f9a1caf351bb9fac3 Mon Sep 17 00:00:00 2001 From: "Hyunjong.park" Date: Wed, 3 Sep 2014 10:24:43 +0900 Subject: [PATCH] opengl : change the rate column value in statistics to time rate Signed-off-by: Hyunjong.park Change-Id: I7f1fe31e0d275ca49ae7c3959478c60265ab2813 --- .../src/org/tizen/dynamicanalyzer/nl/GLPageLabels.java | 2 +- .../tizen/dynamicanalyzer/nl/GLPageLabels.properties | 12 ++++++------ .../ui/opengl/table/state/GLStatisticsTable.java | 17 ++++++++++++++--- .../ui/opengl/table/state/GLStatisticsTableView.java | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.java index 4b3178a..809bd5a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.java @@ -88,7 +88,7 @@ public class GLPageLabels extends NLS { public static String GL_STATISTICS_TITLE; public static String GL_STATISTICS_VIEW_API_NAME; - public static String GL_STATISTICS_VIEW_RATE; + public static String GL_STATISTICS_VIEW_TIME_RATE; public static String GL_STATISTICS_VIEW_COUNT; public static String GL_STATISTICS_VIEW_API_TYPE; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties index 7a6c6ed..327d42e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties @@ -1,5 +1,5 @@ -GL_CHART_TITLE_FRAME_RATE=Frame Rate -GL_CHART_TITLE_FRAME_TIME=Frame Time +GL_CHART_TITLE_FRAME_RATE=Frame rate +GL_CHART_TITLE_FRAME_TIME=Frame time GL_API_LIST_VIEW_TITLE=API List GL_API_LIST_VIEW_SEQ=# @@ -49,13 +49,13 @@ GL_TEXTURE_VIEW_CONTEXT_MIN_FILTER=MIN_FILTER GL_TEXTURE_VIEW_CONTEXT_MAG_FILTER=MAG_FILTER GL_STATISTICS_TITLE = Statistics -GL_STATISTICS_VIEW_API_NAME=API name -GL_STATISTICS_VIEW_RATE=Rate +GL_STATISTICS_VIEW_API_NAME=API +GL_STATISTICS_VIEW_TIME_RATE=Time rate GL_STATISTICS_VIEW_COUNT=Count GL_STATISTICS_VIEW_API_TYPE=API type GL_REDUNDANT_TITLE=Redundant GL_REDUNDANT_VIEW_COUNT= count -GL_REDUNDANT_VIEW_ELAPSED_TIME=Elapsed time(\u03BCs) -GL_REDUNDANT_VIEW_API_NAME=API Name +GL_REDUNDANT_VIEW_ELAPSED_TIME=Elapsed time +GL_REDUNDANT_VIEW_API_NAME=API GL_REDUNDANT_VIEW_PARAMETER=Parameter diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTable.java index 031325a..34909c7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTable.java @@ -81,17 +81,23 @@ public class GLStatisticsTable extends DATableComposite { } int totalCallCount = 0; int size = dataList.size(); + double totlaElapsedTime = 0; + for (int i = 0; i < size; i++) { + GLStatisticsDataType data = dataList.get(i); + totlaElapsedTime += data.getElapsedTime(); + } + for (int i = 0; i < size; i++) { GLStatisticsDataType data = dataList.get(i); List text = new ArrayList(); text.add(data.getAPIName()); - text.add(String.format("%.2f", data.getRate()));//$NON-NLS-1$ + text.add(gerTimeRate(totlaElapsedTime, data.getElapsedTime()));//$NON-NLS-1$ text.add(Integer.toString(data.getCallCount())); text.add(data.getAPIType()); DATableDataFormat tableData = new DATableDataFormat(i + 1); List compareData = new ArrayList(); compareData.add(text.get(0)); - compareData.add(String.format("%.0f", data.getRate() * 100));//$NON-NLS-1$ + compareData.add(String.valueOf(data.getElapsedTime())); compareData.add(text.get(2)); compareData.add(text.get(3)); tableData.setData(compareData); @@ -110,6 +116,11 @@ public class GLStatisticsTable extends DATableComposite { return input; } + private String gerTimeRate(double totalTime, double itemTime) { + double rateTime = itemTime / totalTime * 100; + return String.format("%.2f", rateTime);//$NON-NLS-1$ + } + private TableInput makeTotalRowInfo(int size, int totalCallCount) { List text = new ArrayList(); text.add("Total (" + size + " items)");//$NON-NLS-1$//$NON-NLS-2$ @@ -119,7 +130,7 @@ public class GLStatisticsTable extends DATableComposite { DATableDataFormat tableData = new DATableDataFormat(0); List compareData = new ArrayList(); compareData.add(text.get(0)); - compareData.add("10000");//$NON-NLS-1 + compareData.add("100000000");//$NON-NLS-1 compareData.add(text.get(2)); compareData.add(text.get(3)); tableData.setData(compareData); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTableView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTableView.java index a2315f0..319e60e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTableView.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLStatisticsTableView.java @@ -53,7 +53,7 @@ public class GLStatisticsTableView extends DAViewComposite { private int[] columnAlignment = { SWT.LEFT, SWT.CENTER, SWT.CENTER, SWT.CENTER }; private String[] columnNames = { GLPageLabels.GL_STATISTICS_VIEW_API_NAME, - GLPageLabels.GL_STATISTICS_VIEW_RATE, GLPageLabels.GL_STATISTICS_VIEW_COUNT, + GLPageLabels.GL_STATISTICS_VIEW_TIME_RATE, GLPageLabels.GL_STATISTICS_VIEW_COUNT, GLPageLabels.GL_STATISTICS_VIEW_API_TYPE }; int[] sortTypes = { AnalyzerConstants.SORT_TYPE_STRING, AnalyzerConstants.SORT_TYPE_NUM, -- 2.7.4