[Title] Modify gl page's time unit

[Desc.] Modify time unit to microsecond from milisecond
[Issue]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java
index a114eb3..ed8cb9f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/model/GLAPIData.java
@@ -53,7 +53,7 @@ public class GLAPIData {
        }
 
        public long getElapsedTime() {
-               return logData.getElapsedTime() / TimelineConstants.MEGA_LONG;
+               return logData.getElapsedTime() / TimelineConstants.KILO_LONG;
        }
 
        public long getErrorNo() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLDetailsView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLDetailsView.java
index 2c35b9e..8f7e949 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLDetailsView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/GLDetailsView.java
@@ -144,7 +144,7 @@ public class GLDetailsView extends DAView {
                                        frameIndex);
 
                        frameNumber = "Frame# : " + String.valueOf(frameIndex + 1);
-                       elapsedTime = "Elapsed time : " + glFrameData.getFrametime();
+                       elapsedTime = "Elapsed time : " + glFrameData.getFrametime() + "(μs)";
                        apiCount = glFrameData.getGLApiDataList().size() + " API(s)";
                        errorCount = glFrameData.getErrorCount() + " error(s)";
 

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 bdca7a1..dc6e9c5 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
@@ -66,10 +66,10 @@ public class GLAPIListTable extends DAApiListTableComposite {
                        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_ELAPSED_TIME + "(μs)", //$NON-NLS-1$
                        GLPageLabels.GL_API_LIST_VIEW_ERROR };
 
-       private int[] columnSizes = { 40, 0, 70, 120, 250, 100, 100 };
+       private int[] columnSizes = { 40, 0, 70, 120, 250, 105, 95 };
        private int[] columnAlignment = { SWT.RIGHT, SWT.LEFT, SWT.LEFT, SWT.LEFT,
                        SWT.LEFT, SWT.LEFT };
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListView.java
index 38b0a6c..7e4857a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/apiList/GLAPIListView.java
@@ -62,7 +62,6 @@ public class GLAPIListView extends DAView {
 
                viewContainer = new ViewContainer(this, true);
                viewContainer.setTitleText(GLPageLabels.GL_API_LIST_VIEW_TITLE);
-//             setMaxWeight(innerMaxWeight, outerMaxWeight);
 
                Composite contents = viewContainer.getContentArea();
                contents.setBackground(ColorResources.WINDOW_BG_COLOR);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java
index cd74079..cd37c2a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLChartView.java
@@ -299,28 +299,31 @@ public class GLChartView extends DAView {
        private void initializeCharts() {
                initIntervalMarkers(frameChartBoard);
                
-               GLFPSChart fpsChart = GLFPSChart.getInstance();
-               DAChartBoardItem fpsChartItem = fpsChart.createBoardItem(frameChartBoard);
-               DAChart fpsChartWidget = fpsChartItem.getChart();
-
-               GLFrameChartMouseEventListener glFrameChartMouseEventListener = new GLFrameChartMouseEventListener(
-                               fpsChart.getPopupMenu(), frameChartBoard.getTimeline());
-               
-               fpsChartWidget.getPlot().setMarkers(frameChartBoard.getMarkers());
-               fpsChartWidget.addMouseListener(glFrameChartMouseEventListener);
-               fpsChartWidget.addMouseMoveListener(glFrameChartMouseEventListener);
-               fpsChartWidget.addMouseTrackListener(new TimelineChartMouseTrackAdapter(
-                               frameChartBoard.getTimeline()));
-               
-               BoundLineEventListener underBoundLineEventListener = new BoundLineEventListener(fpsChartWidget, DAChartPlot.BoundType.UNDER);
-               fpsChartWidget.addMouseListener(underBoundLineEventListener);
-               fpsChartWidget.addMouseMoveListener(underBoundLineEventListener);
-               fpsChartWidget.addMouseTrackListener(underBoundLineEventListener);
+//             GLFPSChart fpsChart = GLFPSChart.getInstance();
+//             DAChartBoardItem fpsChartItem = fpsChart.createBoardItem(frameChartBoard);
+//             DAChart fpsChartWidget = fpsChartItem.getChart();
+//
+//             GLFrameChartMouseEventListener glFrameChartMouseEventListener = new GLFrameChartMouseEventListener(
+//                             fpsChart.getPopupMenu(), frameChartBoard.getTimeline());
+//             
+//             fpsChartWidget.getPlot().setMarkers(frameChartBoard.getMarkers());
+//             fpsChartWidget.addMouseListener(glFrameChartMouseEventListener);
+//             fpsChartWidget.addMouseMoveListener(glFrameChartMouseEventListener);
+//             fpsChartWidget.addMouseTrackListener(new TimelineChartMouseTrackAdapter(
+//                             frameChartBoard.getTimeline()));
+//             
+//             BoundLineEventListener underBoundLineEventListener = new BoundLineEventListener(fpsChartWidget, DAChartPlot.BoundType.UNDER);
+//             fpsChartWidget.addMouseListener(underBoundLineEventListener);
+//             fpsChartWidget.addMouseMoveListener(underBoundLineEventListener);
+//             fpsChartWidget.addMouseTrackListener(underBoundLineEventListener);
                
                GLFrameTimeChart frameTimeChart = GLFrameTimeChart.getInstance();
                DAChartBoardItem frameTimeChartItem = frameTimeChart.createBoardItem(frameChartBoard);
                DAChart frameTimeChartWidget = frameTimeChartItem.getChart();
                
+               GLFrameChartMouseEventListener glFrameChartMouseEventListener = new GLFrameChartMouseEventListener(
+                               frameTimeChart.getPopupMenu(), frameChartBoard.getTimeline());
+               
                frameTimeChartWidget.getPlot().setMarkers(frameChartBoard.getMarkers());
                frameTimeChartWidget.addMouseListener(glFrameChartMouseEventListener);
                frameTimeChartWidget.addMouseMoveListener(glFrameChartMouseEventListener);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineConstants.java
index b6de140..9abd466 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineConstants.java
@@ -45,6 +45,7 @@ public class TimelineConstants {
 
        public static final double MEGA_DOUBLE = 1000000;
        public static final long MEGA_LONG = 1000000;
+       public static final long KILO_LONG = 1000;
 
        public static final int NOT_INITED = -1;
 }