From: Hyunjong.park <phjwithyou.park@samsung.com>
Date: Tue, 26 Aug 2014 02:34:34 +0000 (+0900)
Subject: opengl : fix. the compare feature for the table column data
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F26522%2F1;p=sdk%2Ftools%2Fdynamic-analyzer.git

opengl : fix. the compare feature for the table column data
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>

Change-Id: Ibed265c58288e728a330c6acc77bed118b144dae
---

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java
index 01a3b08..800fd9e 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPIListView.java
@@ -43,6 +43,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLFrameRateInfo;
 import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLSelectionData;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DefaultTableComparator;
+import org.tizen.dynamicanalyzer.ui.widgets.table.TableColumnSizePackListener;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData;
 
@@ -54,10 +55,11 @@ public class GLAPIListView extends DAViewComposite {
 			GLPageLabels.GL_API_LIST_VIEW_NAME,
 			GLPageLabels.GL_API_LIST_VIEW_PARAMETER,
 			GLPageLabels.GL_API_LIST_VIEW_RETURN,
-			GLPageLabels.GL_API_LIST_VIEW_ELAPSED_TIME + "(μs)", //$NON-NLS-1$
+			GLPageLabels.GL_API_LIST_VIEW_ELAPSED_TIME,
 			GLPageLabels.GL_API_LIST_VIEW_ERROR, GLPageLabels.GL_API_LIST_VIEW_PID,
 			GLPageLabels.GL_API_LIST_VIEW_TID };
-
+	private boolean[] columnVisibility = { true, true, true, true, true, true, true, true, true,
+			true };
 	private int[] columnSizes = { 40, 0, 70, 120, 250, 70, 105, 95, 60, 60 };
 	private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT, SWT.LEFT,
 			SWT.RIGHT, SWT.LEFT, SWT.RIGHT, SWT.RIGHT };
@@ -72,22 +74,23 @@ public class GLAPIListView extends DAViewComposite {
 	public GLAPIListView(Composite parent, int style) {
 		super(parent, style, true);
 		setLayout(new FillLayout());
-
 		setTitle(GLPageLabels.GL_API_LIST_VIEW_TITLE);
-
 		Composite contents = getContentArea();
 		contents.setBackground(ColorResources.WINDOW_BG_COLOR);
 		contents.setLayout(new FillLayout());
-
 		glAPIListTable = new GLAPITable(contents, SWT.NONE, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL
 				| SWT.V_SCROLL);
-
 		glAPIListTable.setTableName(GLPageLabels.GL_API_LIST_VIEW_TITLE);
 		glAPIListTable.setComparator(new DefaultTableComparator());
 		glAPIListTable.setSortTypes(sortTypes);
 		glAPIListTable.setColumnAlignment(columnAlignment);
 		glAPIListTable.setColumns(columnNames);
 		glAPIListTable.setColumnSize(columnSizes);
+		glAPIListTable.setColumnVisibility(columnVisibility);
+		glAPIListTable.setTableToolTipEnable(true);
+
+		contents.addControlListener(new TableColumnSizePackListener(glAPIListTable, columnSizes));
+
 	}
 
 	@Override
@@ -109,6 +112,10 @@ public class GLAPIListView extends DAViewComposite {
 			handleEventOfChartView(data);
 		} else if (id.equals(GLPage.contextHistoryID)) {
 			handleEventOfContextHistoryButton(data);
+		} else if (id.equals(GLPage.redundantViewID) || id.equals(GLPage.statisticsViewID)
+				|| id.equals(GLPage.apiListViewID)) {
+			glAPIListTable.removeSelection();
+			glAPIListTable.updateTable();
 		}
 	}
 
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java
index 762daa4..783e02c 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/api/GLAPITable.java
@@ -70,10 +70,14 @@ public class GLAPITable extends DATableComposite {
 					int frameIndex = glAPIType.getFrameIndex();
 					long contextId = glAPIType.getContextID();
 
+					GLDataManager.getInstance().setSelectedAPIAtTable(glAPIType.getApiName());
+
 					GLSelectionData selData = new GLSelectionData(GLPage.apiListViewID, time, time,
 							items, table, frameIndex, contextId);
 					AnalyzerManager.getCurrentPage().updateView(selData);
+					AnalyzerManager.updateView(GLPage.apiListViewID, selData);
 				}
+
 			}
 
 			@Override
@@ -112,20 +116,12 @@ public class GLAPITable extends DATableComposite {
 
 			DATableDataFormat tableData = new DATableDataFormat(Long.parseLong(seq));
 			List<Object> compareData = new ArrayList<Object>();
-			compareData.add(seq);
-			compareData.add(Integer.toString(glApiType.getFrameIndex()));
-			compareData.add(String.valueOf(Formatter.toTimeFormat(glApiType.getTime())));
-			compareData.add(glApiType.getApiName());
-			compareData.add(GLConstantDefine.convertEnumValue(glApiType.getArgs(), CommonConstants.COMMA,
-					null));
-			compareData.add(glApiType.getReturn());
-			compareData.add(String.valueOf(glApiType.getElapsedTime()));
-			compareData.add(GLES20ErrorDefine.getError(glApiType.getErrno()));
-			compareData.add(String.valueOf(glApiType.getPid()));
-			compareData.add(String.valueOf(glApiType.getTid()));
+			for (int j = 0; j < text.size(); j++) {
+				compareData.add(text.get(j));
+			}
 			tableData.setLogData(glApiType);
 			tableData.setData(compareData);
-			
+
 			TableInput tableInput = new TableInput();
 			tableInput.setText(text);
 			tableInput.setData(glApiType);
@@ -133,8 +129,10 @@ public class GLAPITable extends DATableComposite {
 			if (!GLES20ErrorDefine.getError(glApiType.getErrno()).contains("SUCCESS")) {//$NON-NLS-1$
 				tableInput.setFailed(true);
 			}
+			if (GLDataManager.getInstance().getSelectedAPIAtTable().equals(glApiType.getApiName())) {
+				tableInput.setSecondSelection(true);
+			}
 			input.add(tableInput);
-
 		}
 		return input;
 	}