[Title] add dynamic frame column in gl api list table

[Desc.]
[Issue]

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 66ae1f9..3f7f561 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.java
@@ -38,7 +38,8 @@ public class GLPageLabels extends NLS {
 
        /* GL API List view */
        public static String GL_API_LIST_VIEW_TITLE;
-       public static String GL_API_LIST_VIEW_INDEX;
+       public static String GL_API_LIST_VIEW_SEQ;
+       public static String GL_API_LIST_VIEW_FRAME;
        public static String GL_API_LIST_VIEW_TIME;
        public static String GL_API_LIST_VIEW_NAME;
        public static String GL_API_LIST_VIEW_PARAMETER;

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 81fd144..7ffa23f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties
@@ -4,7 +4,8 @@ GL_CHART_TITLE_FRAME=Frame
 GL_DETAILS_VIEW_TITLE=Details
 
 GL_API_LIST_VIEW_TITLE=APIs
-GL_API_LIST_VIEW_INDEX=#
+GL_API_LIST_VIEW_SEQ=#
+GL_API_LIST_VIEW_FRAME=Frame
 GL_API_LIST_VIEW_TIME=Time
 GL_API_LIST_VIEW_NAME=API
 GL_API_LIST_VIEW_PARAMETER=Parameter

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java
index 9f0682b..e5ffba6 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListTable.java
@@ -58,27 +58,32 @@ import org.tizen.dynamicanalyzer.ui.opengl.data.model.GLFrameData;
 import org.tizen.dynamicanalyzer.ui.widgets.ViewContainer;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DAApiListTableComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
+import org.tizen.dynamicanalyzer.utils.Formatter;
 
 public class GLAPIListTable extends DAApiListTableComposite {
-       private String[] columnNames = { GLPageLabels.GL_API_LIST_VIEW_INDEX,
+       private static String EMPTY = "";
+       private String[] columnNames = { GLPageLabels.GL_API_LIST_VIEW_SEQ, EMPTY,
                        GLPageLabels.GL_API_LIST_VIEW_TIME,
                        GLPageLabels.GL_API_LIST_VIEW_NAME,
                        GLPageLabels.GL_API_LIST_VIEW_PARAMETER,
                        GLPageLabels.GL_API_LIST_VIEW_ELAPSED_TIME,
                        GLPageLabels.GL_API_LIST_VIEW_ERROR };
 
-       private int[] columnSizes = { 40, 70, 120, 250, 100, 100 };
+       private int[] columnSizes = { 40, 0, 70, 120, 250, 100, 100 };
        private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT,
                        SWT.LEFT, SWT.LEFT };
 
        private int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,
                        AnalyzerConstants.SORT_TYPE_NUM,
+                       AnalyzerConstants.SORT_TYPE_NUM,
                        AnalyzerConstants.SORT_TYPE_STRING,
                        AnalyzerConstants.SORT_TYPE_STRING,
                        AnalyzerConstants.SORT_TYPE_NUM, AnalyzerConstants.SORT_TYPE_STRING };
 
        private int[] sourceColumns = { LogCenterConstants.SEQUENCE_NUMBER_INDEX,
-                       LogCenterConstants.TIME_INDEX, LogCenterConstants.APINAME_INDEX,
+                       //FIXME
+                       0, LogCenterConstants.TIME_INDEX,
+                       LogCenterConstants.APINAME_INDEX,
                        LogCenterConstants.INPUTPARM_INDEX, LogCenterConstants.TIME_INDEX,
                        LogCenterConstants.ERROR_INDEX };
 
@@ -268,9 +273,14 @@ public class GLAPIListTable extends DAApiListTableComposite {
 
                List<TableInput> inputList = new ArrayList<TableInput>();
                if (endFrameIndex == -1) {
+                       //TODO
+                       table.getColumn(1).setWidth(0);
+                       table.getColumn(1).setText(EMPTY);
                        makeInputList(inputList, involvedMap, insideColumnMap,
                                        startFrameIndex);
                } else {
+                       table.getColumn(1).setWidth(45);
+                       table.getColumn(1).setText(GLPageLabels.GL_API_LIST_VIEW_FRAME);
                        for (int index = startFrameIndex; index < endFrameIndex; index++) {
                                makeInputList(inputList, involvedMap, insideColumnMap, index);
                        }
@@ -294,7 +304,8 @@ public class GLAPIListTable extends DAApiListTableComposite {
 
                        String seq = String.valueOf(glAPIData.getSeq());
                        texts.add(seq);
-                       texts.add(String.valueOf(glAPIData.getTime()));
+                       texts.add(Integer.toString(frameIndex));
+                       texts.add(String.valueOf(Formatter.toTimeFormat(glAPIData.getTime())));
                        texts.add(glAPIData.getName());
                        texts.add(glAPIData.getParameter());
                        texts.add(String.valueOf(glAPIData.getElapsedTime()));