[Title] change colume name at uiprofiling
authorHyunjong,Pakr <phjwithyou.park@samsung.com>
Fri, 30 Nov 2012 08:05:12 +0000 (17:05 +0900)
committerHyunjong,Pakr <phjwithyou.park@samsung.com>
Fri, 30 Nov 2012 08:05:12 +0000 (17:05 +0900)
[Desc.] user interface page
[Issue] redmine #7377

org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StartHandler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/StopHandler.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserInterfacePageLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/control/UIControlListView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/profiling/UIFunctionProfilingView.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListTable.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/userinterface/scene/UITransformListView.java

index f283600..7cb4fc5 100644 (file)
@@ -7,6 +7,9 @@ import org.eclipse.swt.widgets.Display;
 import org.tizen.dynamicanalyzer.ui.summary.SummaryPage;
 import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView;
 import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView;
+import org.tizen.dynamicanalyzer.ui.userinterface.UIPage;
+import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListView;
+import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingView;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 
@@ -29,6 +32,14 @@ public class StartHandler extends AbstractHandler {
                                                SummaryPage.ID, LeakView.ID);
                                ((DATreeComposite) leakView.getControl()).getTable()
                                                .setSelectionEnabled(false);
+                               UIFunctionProfilingView uiProfilingView = (UIFunctionProfilingView) AnalyzerUtil.getView(
+                                               UIPage.ID, UIFunctionProfilingView.ID);
+                               ((DATreeComposite) uiProfilingView.getControl()).getTable()
+                                               .setSelectionEnabled(false);
+                               UIControlListView uiControlView = (UIControlListView) AnalyzerUtil.getView(
+                                               UIPage.ID, UIControlListView.ID);
+                               ((DATreeComposite) uiControlView.getControl()).getTable()
+                                               .setSelectionEnabled(false);
                        }
                });
                return null;
index 5cc3c4f..56b85ee 100644 (file)
@@ -7,6 +7,9 @@ import org.eclipse.swt.widgets.Display;
 import org.tizen.dynamicanalyzer.ui.summary.SummaryPage;
 import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView;
 import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingView;
+import org.tizen.dynamicanalyzer.ui.userinterface.UIPage;
+import org.tizen.dynamicanalyzer.ui.userinterface.control.UIControlListView;
+import org.tizen.dynamicanalyzer.ui.userinterface.profiling.UIFunctionProfilingView;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 
@@ -28,6 +31,14 @@ public class StopHandler extends AbstractHandler {
                                                SummaryPage.ID, LeakView.ID);
                                ((DATreeComposite) leakView.getControl()).getTable()
                                                .setSelectionEnabled(true);
+                               UIFunctionProfilingView uiProfilingView = (UIFunctionProfilingView) AnalyzerUtil.getView(
+                                               UIPage.ID, UIFunctionProfilingView.ID);
+                               ((DATreeComposite) uiProfilingView.getControl()).getTable()
+                                               .setSelectionEnabled(true);
+                               UIControlListView uiControlView = (UIControlListView) AnalyzerUtil.getView(
+                                               UIPage.ID, UIControlListView.ID);
+                               ((DATreeComposite) uiControlView.getControl()).getTable()
+                                               .setSelectionEnabled(true);
                        }
                });
                return null;
index b00ab5d..1cbb4fe 100644 (file)
@@ -17,15 +17,11 @@ USERINTERFACE_SNAPSHOT_VIEW_NAME = Snapshot
 
 USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_NAME = UI Function Profiling
 USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_0 = Library or function name
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_1 = CPU time
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_2 = CPU avg. time 
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_3 = Elapsed time
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_4 = Elapsed avg. time
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_5 = CPU time
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_6 = CPU avg. time 
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_7 = Elapsed time
-USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_8 = Elapsed avg. time
-
-
-
-
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_1 = Elapsed sum time
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_2 = Elapsed average time 
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_3 = Elapsed sum time
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_4 = Elapsed average time
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_5 = CPU sum time
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_6 = CPU average time 
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_7 = CPU sum time
+USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_8 = CPU average time 
\ No newline at end of file
index 6a03e0f..cd5e76d 100755 (executable)
@@ -794,6 +794,32 @@ public class SqlManager {
                unlockDB();
                return output;
        }
+       
+       public static String executeSelectQuery(String query) {
+               lockDB();
+               Connection conn = getConnection();
+               if (null == conn) {
+                       unlockDB();
+                       return null;
+               }
+
+               String output = null;
+               try {
+                       Statement stat = conn.createStatement();
+                       ResultSet rs = stat.executeQuery(query);
+                       if (rs.next()) {
+                               output = rs.getString(1);                               
+                       }
+                       if (!rs.isClosed()) {
+                               rs.close();
+                       }
+               } catch (Exception e) {
+                       System.out.println("Error!"); //$NON-NLS-1$
+                       e.printStackTrace();
+               }
+               unlockDB();
+               return output;
+       }
 
        public static List<List<String>> executeSelectQueryFD(String query, int size) {
                lockDB();
@@ -825,6 +851,8 @@ public class SqlManager {
                unlockDB();
                return outputList;
        }
+       
+       
 
        public static List<List<String>> executeDeviceInfoQuery(String query) {
                lockDB();
index 6e07bcc..bbf5861 100644 (file)
@@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Listener;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.common.DASelectionData;
-import org.tizen.dynamicanalyzer.logparser.LogCenterConstants;
 import org.tizen.dynamicanalyzer.model.TreeInput;
 import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData;
 import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager;
@@ -53,6 +52,7 @@ import org.tizen.dynamicanalyzer.ui.widgets.table.DATreeComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.TreeDataComparator;
 
 public class UIControlListTable extends DATreeComposite {
+       public static final String ID = UIControlListTable.class.getName();
 
        public UIControlListTable(Composite parent, int compStyle, int tableStyle) {
                super(parent, compStyle, tableStyle);
@@ -83,13 +83,9 @@ public class UIControlListTable extends DATreeComposite {
 
                        @Override
                        public void widgetSelected(SelectionEvent e) {
-
                                GridItem[] items = tree.getSelection();
-                               DATableDataFormat dataFormat = (DATableDataFormat) items[0].getData();
-                               String time = dataFormat.getData().get(LogCenterConstants.TIME_INDEX);
-                               
                                DASelectionData selData = new DASelectionData(
-                                               UIControlListView.ID, Long.parseLong(time), 0, items, tree);
+                                               UIControlListView.ID, 0, 0, items, tree);
                                AnalyzerManager.getCurrentPage().updatePage(selData);
                                AnalyzerManager.getCurrentPage().controlSelection(
                                                UIControlListView.ID);
@@ -98,6 +94,7 @@ public class UIControlListTable extends DATreeComposite {
                        @Override
                        public void widgetDefaultSelected(SelectionEvent e) {
                                // TODO Auto-generated method stub
+
                        }
                });
 
index e95199b..a5d4abf 100644 (file)
@@ -53,7 +53,7 @@ public class UIControlListView extends DAView {
                        UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_1,
                        UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_2,
                        UserInterfacePageLabels.USERINTERFACE_CONTROL_LIST_VIEW_COLUMN_3 };
-       private int[] columnSizes = { 150, 80, 80, 150 };
+       private int[] columnSizes = { 250, 0, 0, 0 };
 
        UIControlListTable treeComp = null;
        private boolean[] columnVisibility = { true, true, true, true, true };
index b5c667f..c606c1d 100644 (file)
@@ -47,7 +47,6 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.common.DASelectionData;
 import org.tizen.dynamicanalyzer.model.ColumnData;
 import org.tizen.dynamicanalyzer.model.TreeInput;
-import org.tizen.dynamicanalyzer.ui.summary.profiling.FunctionUsageProfilingTableCellRenderer;
 import org.tizen.dynamicanalyzer.ui.summary.profiling.ProfilingData;
 import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
@@ -160,7 +159,7 @@ public class UIFunctionProfilingTable extends DATreeComposite {
                        column = new GridColumn(table, SWT.NONE);
                }
 
-               column.setCellRenderer(new FunctionUsageProfilingTableCellRenderer());
+               column.setCellRenderer(new UIFunctionProfilingTableCellRenderer());
                column.setHeaderRenderer(new DATableHeaderRenderer());
                column.setText(data.getText());
                if (data.getWidth() == 0) {
@@ -205,16 +204,16 @@ public class UIFunctionProfilingTable extends DATreeComposite {
                // make input data
                inputData.add(input.getSequence());
                inputData.add(input.getAPIName());
-               inputData.add(input.getExclCPUTime());
-               inputData.add(input.getExclCPUAvgTime());
+               
+               inputData.add(input.getInclEsapsedTime());
+               inputData.add(input.getInclEsapsedAvgTime());
                inputData.add(input.getExclEsapsedTime());
                inputData.add(input.getExclEsapsedAvgTime());
                inputData.add(input.getInclCPUTime());
                inputData.add(input.getInclCPUAvgTime());
-               inputData.add(input.getInclEsapsedTime());
-               inputData.add(input.getInclEsapsedAvgTime());
+               inputData.add(input.getExclCPUTime());
+               inputData.add(input.getExclCPUAvgTime());
                
-
                tableData.getData().addAll(inputData);
 
                tableData.setObject(input.getAPIName());
@@ -222,16 +221,15 @@ public class UIFunctionProfilingTable extends DATreeComposite {
                List<String> text = new ArrayList<String>();
 
                text.add(input.getAPIName());
-               text.add(input.getExclCPUTime());
-               text.add(input.getExclCPUAvgTime());
+               text.add(input.getInclEsapsedTime());
+               text.add(input.getInclEsapsedAvgTime());
                text.add(input.getExclEsapsedTime());
                text.add(input.getExclEsapsedAvgTime());
                text.add(input.getInclCPUTime());
                text.add(input.getInclCPUAvgTime());
-               text.add(input.getInclEsapsedTime());
-               text.add(input.getInclEsapsedAvgTime());
+               text.add(input.getExclCPUTime());
+               text.add(input.getExclCPUAvgTime());
                
-
                TreeInput output = new TreeInput();
                output.setText(text);
                output.setData(tableData);
index e318089..9f5da10 100644 (file)
@@ -58,7 +58,7 @@ public class UIFunctionProfilingView extends DAView {
                        UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_6,
                        UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_7,
                        UserInterfacePageLabels.USERINTERFACE_UIFUNCTIONPROFILING_LIST_VIEW_COLUMN_8 };
-       private int[] columnSizes = { 280, 90, 90, 90, 90, 90, 90, 90, 90 };
+       private int[] columnSizes = { 280, 0, 0, 0, 0, 0, 0, 0, 0 };
        UIFunctionProfilingTable treeComp = null;
        private boolean[] columnVisibility = { true, true, true, true, true, true,
                        true, true, true };
@@ -111,27 +111,34 @@ public class UIFunctionProfilingView extends DAView {
                ColumnData data0 = new ColumnData(columnNames[columnIndex++]);
                columnData.add(data0);
 
-               ColumnData data1 = new ColumnData("Exclusive");
-               ColumnData data1Child1 = new ColumnData(columnNames[columnIndex++]);
-               ColumnData data1Child2 = new ColumnData(columnNames[columnIndex++]);
-               ColumnData data1Child3 = new ColumnData(columnNames[columnIndex++]);
-               ColumnData data1Child4 = new ColumnData(columnNames[columnIndex++]);
-               data1.getChildren().add(data1Child1);
-               data1.getChildren().add(data1Child2);
-               data1.getChildren().add(data1Child3);
-               data1.getChildren().add(data1Child4);
-               columnData.add(data1);
-
-               ColumnData data2 = new ColumnData("Inclusive");
-               ColumnData data2Child1 = new ColumnData(columnNames[columnIndex++]);
-               ColumnData data2Child2 = new ColumnData(columnNames[columnIndex++]);
-               ColumnData data2Child3 = new ColumnData(columnNames[columnIndex++]);
-               ColumnData data2Child4 = new ColumnData(columnNames[columnIndex++]);
-               data2.getChildren().add(data2Child1);
-               data2.getChildren().add(data2Child2);
-               data2.getChildren().add(data2Child3);
-               data2.getChildren().add(data2Child4);
-               columnData.add(data2);
+               ColumnData dataInc1 = new ColumnData("Inclusive");
+               ColumnData dataInc1Child1 = new ColumnData(columnNames[columnIndex++]);
+               ColumnData dataInc1Child2 = new ColumnData(columnNames[columnIndex++]);
+               dataInc1.getChildren().add(dataInc1Child1);
+               dataInc1.getChildren().add(dataInc1Child2);
+               columnData.add(dataInc1);
+
+               ColumnData dataExc1 = new ColumnData("Exclusive");
+               ColumnData dataExc1Child1 = new ColumnData(columnNames[columnIndex++]);
+               ColumnData dataExc1Child2 = new ColumnData(columnNames[columnIndex++]);
+               dataExc1.getChildren().add(dataExc1Child1);
+               dataExc1.getChildren().add(dataExc1Child2);
+               columnData.add(dataExc1);
+               
+               ColumnData dataInc2 = new ColumnData("Inclusive");
+               ColumnData dataInc2Child1 = new ColumnData(columnNames[columnIndex++]);
+               ColumnData dataInc2Child2 = new ColumnData(columnNames[columnIndex++]);
+               dataInc2.getChildren().add(dataInc2Child1);
+               dataInc2.getChildren().add(dataInc2Child2);
+               columnData.add(dataInc2);
+
+               ColumnData dataExc2 = new ColumnData("Exclusive");
+               ColumnData dataExc2Child1 = new ColumnData(columnNames[columnIndex++]);
+               ColumnData dataExc2Child2 = new ColumnData(columnNames[columnIndex++]);
+               dataExc2.getChildren().add(dataExc2Child1);
+               dataExc2.getChildren().add(dataExc2Child2);
+               columnData.add(dataExc2);
+
 
        }
 
index 6475de8..ee5addc 100644 (file)
@@ -34,9 +34,11 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.Composite;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;
+import org.tizen.dynamicanalyzer.common.CommonConstants;
 import org.tizen.dynamicanalyzer.common.DASelectionData;
 import org.tizen.dynamicanalyzer.logparser.LogCenterConstants;
 import org.tizen.dynamicanalyzer.model.TableInput;
+import org.tizen.dynamicanalyzer.sql.SqlManager;
 import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableComposite;
 import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
@@ -53,13 +55,19 @@ public class UITransformListTable extends DATableComposite {
                                
                                GridItem[] items = table.getSelection();
                                DATableDataFormat dataFormat = (DATableDataFormat) items[0].getData();
-                               String time = dataFormat.getData().get(LogCenterConstants.TIME_INDEX);
+                               
+                               
+                               
+                               String time = getSnapsotForScene(dataFormat.getData().get(LogCenterConstants.TIME_INDEX)); 
+                               
                                
                                DASelectionData selData = new DASelectionData(
                                                UITransformListView.ID, Long.parseLong(time), 0, items, table);
                                AnalyzerManager.getCurrentPage().updatePage(selData);
                                AnalyzerManager.getCurrentPage().controlSelection(
                                                UITransformListView.ID);
+                               
+                               
                        }
 
                        @Override
@@ -67,6 +75,17 @@ public class UITransformListTable extends DATableComposite {
                        }
                });
        }
+       
+       private String getSnapsotForScene(String strTime) {
+               String query = "select min(time) from screenshot where time >="
+                               + strTime + ";";
+               String result = SqlManager.executeSelectQuery(query);
+               
+               if ( result ==  null){
+                       result = CommonConstants.ZERO;
+               }
+               return result;
+       }
 
        protected List<TableInput> makeTableInput() {
 
index d7754f2..ae22b5e 100644 (file)
@@ -52,7 +52,7 @@ public class UITransformListView extends DAView {
                        UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_2,
                        UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_3,
                        UserInterfacePageLabels.USERINTERFACE_SCENETRANSFORM_LIST_VIEW_COLUMN_4 };
-       private int[] columnSizes = { 75, 90, 90, 90, 90 };
+       private int[] columnSizes = { 75, 120, 120, 120, 120 };
        private boolean[] columnVisibility = { true, true, true, true, true };
 
        int[] sortTypes = { AnalyzerConstants.SORT_TYPE_NUM,