[Title]design ver0.1 UI event chart

[Desc.]
[Issue]

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DACustomChartRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DACustomChartRenderer.java
index 271e1d6..f2d81cf 100644 (file)
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DACustomChartRenderer.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DACustomChartRenderer.java
@@ -34,8 +34,8 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Display;
 import org.tizen.dynamicanalyzer.widgets.helper.ColorResources;
+import org.tizen.dynamicanalyzer.widgets.helper.FontResources;
 
 public class DACustomChartRenderer {
        public static final int MARGIN = 3; // FIXME
@@ -45,6 +45,17 @@ public class DACustomChartRenderer {
        private List<DACustomChartSeries> seriesList = null;
        private DACustomChartPlot plot = null;
        private Rectangle r = null;
+       
+       public final int SCREENSHOT_WIDTH = 40;
+       public final int SCREENSHOT_HEIGHT = 66;
+       public final int SCREENSHOT_TOP_MARGIN = 10;
+       public final int SCREENSHOT_HORIZONTAL_TOP_MARGIN = 13;
+       public final int SCREENSHOT_SELECTED_MOVE_SIZE = 6;
+       public final int SCREENSHOT_HORIZONTAL_SELECTED_MOVE_SIZE = 19;
+       public final int SCREENSHOT_SELECTED_LINE_WIDTH = 4;
+       public final int SCREENSHOT_BORDER_LINE_WIDTH = 1;
+       
+       public final int MULTY_CHECK_BAR_WIDTH = 2;
 
        public void draw(GC gc, DACustomChart chart) {
                if (false == bInitialized) {
@@ -94,7 +105,7 @@ public class DACustomChartRenderer {
                                        drawAreaSeries(gc, series);
                                        break;
                                case DACustomChartSeries.SERIES_STYLE_MULTY_CHECK_BAR:
-                                       drawBarStackSeries(gc, series, seriesSize, i);
+                                       drawMultyCheckBarSeries(gc, series, seriesSize, i);
                                        break;
                                case DACustomChartSeries.SERIES_STYLE_STEP:
                                        drawStepSeries(gc, series);
@@ -275,9 +286,11 @@ public class DACustomChartRenderer {
                                        DACustomChartPlotTooltip.TOOLTIP_SERIES_RECT_LENGTH,
                                        DACustomChartPlotTooltip.TOOLTIP_SERIES_RECT_LENGTH);
                        gc.setBackground(tooltip.getBackgroundColor());
-                       gc.drawString(tooltipTexts.get(i), startX
+                       gc.drawText(tooltipTexts.get(i), startX
                                        + DACustomChartPlotTooltip.TOOLTIP_MARGIN
                                        + DACustomChartPlotTooltip.TOOLTIP_SERIES_RECT_LENGTH
+//                                     + DACustomChartPlotTooltip.TOOLTIP_MARGIN, y, SWT.DRAW_DELIMITER);
+//                     if(plot instanceof DACustomUIEventChartPlot) {
                                        + DACustomChartPlotTooltip.TOOLTIP_MARGIN, y);
                        if (plot instanceof DACustomUIEventChartPlot) {
                                break;
@@ -346,16 +359,23 @@ public class DACustomChartRenderer {
                }
                gc.setAlpha(255);
        }
-
-       private void drawBarStackSeries(GC gc, DACustomChartSeries series,
-                       int seriesSize, int seriesIndex) {
+       
+       private void drawMultyCheckBarSeries(GC gc, DACustomChartSeries series, int seriesSize, int seriesIndex) {
                List<DACustomChartSeriesItem> seriesItems = series.getSeriesItemList();
                if (null == seriesItems) {
                        return;
                }
 
                int seriesItemSize = seriesItems.size();
-
+               Rectangle rect = new Rectangle(r.x, r.y + (r.height/seriesSize * seriesIndex), r.width, r.height/seriesSize);
+               gc.setForeground(ColorResources.UI_EVENT_CHART_TEXT);
+               gc.setFont(FontResources.TIMELINE_TICK_FONT);
+               gc.drawText(series.getName(), rect.x + 3, rect.y + 3, true);
+               if(seriesIndex != 0) {
+                       gc.setForeground(ColorResources.UI_EVENT_CHART_SEPERATE_LINE);
+                       gc.drawLine(rect.x, rect.y, rect.width, rect.y);
+               }
+               
                if (seriesItemSize < 1) {
                        return;
                }
@@ -367,41 +387,21 @@ public class DACustomChartRenderer {
                if (index < 0) {
                        index = 0;
                }
-
-               Rectangle rect = new Rectangle(r.x, r.y
-                               + (r.height / seriesSize * seriesIndex), r.width, r.height
-                               / seriesSize);
-               gc.setForeground(new Color(Display.getCurrent(), 0, 0, 193));
-               gc.drawRectangle(rect);
-
+               
                for (int i = index; i < seriesItemSize; i++) {
                        seriesItem = seriesItems.get(i);
 
-                       double barWidthTime = 0;
-                       if (seriesItem.getBarWidth() == -1) {
-                               barWidthTime = series.getBarWidth();
-                       } else {
-                               barWidthTime = seriesItem.getBarWidth();
-                       }
-
                        double currentX = seriesItem.getX();
-
                        int pixcelStartX = plot.getXPixcelFromX(currentX, rect);
-                       int barWidth = plot.getXPixcelFromX(currentX + barWidthTime, rect)
-                                       - pixcelStartX;
-
-                       if (barWidth < 1) {
-                               barWidth = 1;
-                       }
+                       
+                       //FIXME 
                        color = seriesItem.getEventColor();
                        if (null != color) {
                                gc.setBackground(color);
-                               gc.fillRectangle(pixcelStartX, rect.y + MARGIN, barWidth,
-                                               rect.height - MARGIN);
+                               gc.fillRectangle(pixcelStartX, rect.y + MARGIN, MULTY_CHECK_BAR_WIDTH, rect.height - MARGIN);
                                gc.setBackground(series.getColor());
                        } else {
-                               gc.fillRectangle(pixcelStartX, rect.y + MARGIN, barWidth,
-                                               rect.height - MARGIN);
+                               gc.fillRectangle(pixcelStartX, rect.y + MARGIN, MULTY_CHECK_BAR_WIDTH, rect.height - MARGIN);
                        }
                        if (currentX > plot.getVisibleEndX()) {
                                break;
@@ -633,23 +633,15 @@ public class DACustomChartRenderer {
                }
 
                DACustomChartSeriesItem seriesItem;
-               // Color color = series.getColor();
-               // gc.setBackground(color);
-               // gc.setAlpha((int) (255 * 0.8));
-               // gc.setAntialias(SWT.ON);
 
                int index = series.getPrevIndexByXvalue(plot.getVisibleStartX());
                if (index < 0) {
                        index = 0;
                }
                Image image;
-               gc.setBackground(new Color(Display.getCurrent(), 193, 193, 193)); // FIXME
-               gc.setForeground(new Color(Display.getCurrent(), 0, 0, 193)); // FIXME
-
-               int highlightedImageIndex = ((DACustomScreenshotChartPlot) plot)
-                               .getHighlightedImageIndex();
-               int selectedImageIndex = ((DACustomScreenshotChartPlot) plot)
-                               .getSelectedImageIndex();
+               
+               int highlightedImageIndex = ((DACustomScreenshotChartPlot)plot).getHighlightedImageIndex();
+               int selectedImageIndex = ((DACustomScreenshotChartPlot)plot).getSelectedImageIndex();
                for (int i = index; i < seriesItemSize; i++) {
                        seriesItem = seriesItems.get(i);
                        double currentX = seriesItem.getX();
@@ -657,51 +649,37 @@ public class DACustomChartRenderer {
                        int pixcelStartX = plot.getXPixcelFromX(currentX, r);
                        image = seriesItem.getImage();
 
-                       if (null == image) {
-                               gc.fillRectangle(pixcelStartX, r.y + (MARGIN * 2),
-                                               plot.getXPixcelFromX(currentX + 1.0, r) - pixcelStartX,
-                                               r.height - (MARGIN * 4));
-                               gc.drawRectangle(pixcelStartX, r.y + (MARGIN * 2),
-                                               plot.getXPixcelFromX(currentX + 1.0, r) - pixcelStartX,
-                                               r.height - (MARGIN * 4));
-                       } else {
-                               if (i != highlightedImageIndex && i != selectedImageIndex) {
-                                       gc.drawImage(image, pixcelStartX, (MARGIN * 2));
-                                       // gc.drawImage(image, srcX, srcY, srcWidth, srcHeight,
-                                       // destX, destY, destWidth, destHeight);
-                               }
+                       if (i != highlightedImageIndex && i != selectedImageIndex) {
+                               gc.drawImage(image, pixcelStartX, SCREENSHOT_TOP_MARGIN);
                        }
+                       
                        if (currentX > plot.getVisibleEndX()) {
                                break;
                        }
                }
 
-               if (selectedImageIndex != -1) {
-                       gc.setForeground(ColorResources.BLACK);
-                       gc.setLineWidth(4);
-                       Image selectedImage = seriesItems.get(selectedImageIndex)
-                                       .getImage();
+               if (selectedImageIndex >= 0) {
+                       gc.setForeground(ColorResources.SCREENSHOT_CHART_SELECTED_LINE);
+                       gc.setLineWidth(SCREENSHOT_SELECTED_LINE_WIDTH);
+                       Image selectedImage = seriesItems.get(selectedImageIndex).getImage();
                        double currentX = seriesItems.get(selectedImageIndex).getX();
                        int pixcelStartX = plot.getXPixcelFromX(currentX, r);
                        if (selectedImageIndex == highlightedImageIndex) {
-                               gc.drawRectangle(pixcelStartX - 1, r.y + (MARGIN * 2) - 1 - 10,
-                                               selectedImage.getBounds().width + 1,
-                                               selectedImage.getBounds().height + 1);
+                               gc.drawRectangle(pixcelStartX - 1, r.y + SCREENSHOT_TOP_MARGIN - SCREENSHOT_SELECTED_MOVE_SIZE,
+                                               selectedImage.getBounds().width + 1, selectedImage.getBounds().height + 1);
                        } else {
-                               gc.drawRectangle(pixcelStartX - 1, r.y + (MARGIN * 2) - 1,
-                                               selectedImage.getBounds().width + 1,
+                               gc.drawRectangle(pixcelStartX - 1, r.y + SCREENSHOT_TOP_MARGIN - 1, selectedImage.getBounds().width + 1,
                                                selectedImage.getBounds().height + 1);
-                               gc.drawImage(selectedImage, pixcelStartX, (MARGIN * 2));
+                               gc.drawImage(selectedImage, pixcelStartX, SCREENSHOT_TOP_MARGIN);
                        }
                }
 
-               if (highlightedImageIndex != -1) {
-                       Image highlightedImage = seriesItems.get(highlightedImageIndex)
-                                       .getImage();
+               if (highlightedImageIndex >= 0) {
+                       Image highlightedImage = seriesItems.get(highlightedImageIndex).getImage();
                        double currentX = seriesItems.get(highlightedImageIndex).getX();
                        int pixcelStartX = plot.getXPixcelFromX(currentX, r);
 
-                       gc.drawImage(highlightedImage, pixcelStartX, (MARGIN * 2 - 10));
+                       gc.drawImage(highlightedImage, pixcelStartX, SCREENSHOT_TOP_MARGIN - SCREENSHOT_SELECTED_MOVE_SIZE);
                }
        }
 

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/helper/ColorResources.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/helper/ColorResources.java
index 7eef5f9..5194eba 100644 (file)
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/helper/ColorResources.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/helper/ColorResources.java
@@ -55,6 +55,13 @@ public class ColorResources {
        public static Color CHART_NAME_BACK_START = getColor("chart_name_back_start", new RGB(215, 215, 215)); //$NON-NLS-1$\r
        public static Color CHART_NAME_BACK_END = getColor("chart_name_back_end", new RGB(157, 166, 168)); //$NON-NLS-1$\r
        public static Color CHART_NAME_CHILD_BACK = getColor("chart_name_child_back", new RGB(103, 103, 103)); //$NON-NLS-1$\r
+       \r
+       public static Color UI_EVENT_CHART_SEPERATE_LINE = getColor("UI_event_chart_seperate_line", new RGB(189, 207, 213)); //$NON-NLS-1$\r
+       public static Color UI_EVENT_CHART_TEXT = getColor("UI_event _chat_text", new RGB(83, 83, 83)); //$NON-NLS-1$\r
+       \r
+       public static Color SCREENSHOT_CHART_SELECTED_LINE = getColor("screenshot_chart_selected_line" , new RGB(59, 188, 232)); //$NON-NLS-1$\r
+       public static Color SCREENSHOT_CHART_BORDER_LINE = getColor("screenshot_chart_border_line" , new RGB(117, 117, 117)); //$NON-NLS-1$\r
+       \r
        public static Color CHART_BOARD_BACK = getColor("chart_board_back", new RGB(230, 230, 230)); //$NON-NLS-1$\r
 \r
        \r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLabels.properties
index 77b2e82..a1104f8 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLabels.properties
@@ -32,11 +32,11 @@ SYSTEM_MEMORY_CHART_TITLE=Memory
 
 SCREENSHOT_CHART_TITLE=Screenshot
 
-UI_EVENT_CHART_SERIES_NAME_KEY=Key event
-UI_EVENT_CHART_SERIES_NAME_TOUCH=Touch event
-UI_EVENT_CHART_SERIES_NAME_GESTURE=Gesture event
-UI_EVENT_CHART_SERIES_NAME_ORIENTATION=Orientation event
-UI_EVENT_CHART_SERIES_NAME_FRAMEWORK=Event listener
+UI_EVENT_CHART_SERIES_NAME_KEY=Key
+UI_EVENT_CHART_SERIES_NAME_TOUCH=Touch
+UI_EVENT_CHART_SERIES_NAME_GESTURE=Gesture
+UI_EVENT_CHART_SERIES_NAME_ORIENTATION=Orientation
+UI_EVENT_CHART_SERIES_NAME_FRAMEWORK=Famework
 UI_EVENT_CHART_TITLE=UI Event
 
 TIMELINE_TICK_ADD=Add

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ColorResources.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
index 596d86b..76f6f5a 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
@@ -396,7 +396,7 @@ public class ColorResources {
        public static Color SERIES_COLOR_UI_EVENT_TOUCH = getColor("seriesColorUIEventTouch");//$NON-NLS-1$\r
        public static Color SERIES_COLOR_UI_EVENT_GESTURE = getColor("seriesColorUIEventGesture");//$NON-NLS-1$\r
        public static Color SERIES_COLOR_UI_EVENT_ORIENTATION = getColor("seriesColorUIEventOrientation");//$NON-NLS-1$\r
-       public static Color SERIES_COLOR_UI_EVENT_FRAMEWORK= getColor("seriesColorUIEventListener");//$NON-NLS-1$\r
+       public static Color SERIES_COLOR_UI_EVENT_FRAMEWORK= getColor("seriesColorUIEventFramework");//$NON-NLS-1$\r
 \r
        public static Color SELECTION_RANGE = getColor("selectionRange"); //$NON-NLS-1$\r
        public static Color SELECTION_LINE = getColor("selectionLine"); //$NON-NLS-1$\r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java
index ff857dc..5b290a4 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java
@@ -365,10 +365,12 @@ public class DAThemeBlack extends DATheme {
                setColor("seriesColorUIEventTouch", new RGB(200, 0, 0)); //$NON-NLS-1$
                setColor("seriesColorUIEventGesture", new RGB(200, 0, 0)); //$NON-NLS-1$
                setColor("seriesColorUIEventOrientation", new RGB(200, 0, 0)); //$NON-NLS-1$
-               setColor("seriesColorUIEventListener", new RGB(200, 0, 0)); //$NON-NLS-1$
+               setColor("seriesColorUIEventFramework", new RGB(200, 0, 0)); //$NON-NLS-1$
 
                setColor("selectionRange", new RGB(193, 253, 255)); //$NON-NLS-1$
                setColor("selectionLine", new RGB(193, 253, 255)); //$NON-NLS-1$
+               
+               setColor("UIEventChartSeperateLine", new RGB(189, 207, 213)); //$NON-NLS-1$
 
                /*** scale ***/
                setColor("scale_outline_color", new RGB(31, 31, 31)); //$NON-NLS-1$

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
index 9f1fc93..1f07138 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
@@ -381,11 +381,11 @@ public class DAThemeWhite extends DATheme {
                setColor("seriesColorFileWrite", new RGB(72, 185, 221)); //$NON-NLS-1$
                setColor("seriesColorFileFD", new RGB(111, 151, 39)); //$NON-NLS-1$
                
-               setColor("seriesColorUIEventKey", new RGB(200, 0, 0)); //$NON-NLS-1$
-               setColor("seriesColorUIEventTouch", new RGB(200, 0, 0)); //$NON-NLS-1$
-               setColor("seriesColorUIEventGesture", new RGB(200, 0, 0)); //$NON-NLS-1$
-               setColor("seriesColorUIEventOrientation", new RGB(200, 0, 0)); //$NON-NLS-1$
-               setColor("seriesColorUIEventListener", new RGB(200, 0, 0)); //$NON-NLS-1$
+               setColor("seriesColorUIEventKey", new RGB(122, 132, 238)); //$NON-NLS-1$
+               setColor("seriesColorUIEventTouch", new RGB(129, 172, 50)); //$NON-NLS-1$
+               setColor("seriesColorUIEventGesture", new RGB(236, 107, 47)); //$NON-NLS-1$
+               setColor("seriesColorUIEventOrientation", new RGB(177, 202, 229)); //$NON-NLS-1$
+               setColor("seriesColorUIEventFramework", new RGB(212, 150, 57)); //$NON-NLS-1$
                
                setColor("selectionRange", new RGB(23, 98, 132)); //$NON-NLS-1$
                setColor("selectionLine", new RGB(23, 98, 132)); //$NON-NLS-1$

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
index ecbb860..62d5650 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java
@@ -38,6 +38,7 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
+import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeriesItem;
@@ -58,6 +59,7 @@ public class CPUChart extends TimelineChart {
 
        private CPUChart() {
                chartType = TimelineConstants.CHART_TYPE_CPU;
+               probeType = TimelineUtils.getProbeID(chartType);
                chartName = TimelineChartLabels.CPU_CHART_TITLE;
                chartIcon = ImageResources.CHART_CPU;
                addIcon = ImageResources.ADD_CHART_CPU;
@@ -89,7 +91,7 @@ public class CPUChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if (!isAbleToParse(logPack, probeType)) {
                        return;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java
index 6916368..5ea1cad 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUCoreChart.java
@@ -38,6 +38,7 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
+import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeriesItem;
@@ -58,6 +59,7 @@ public class CPUCoreChart extends TimelineChart {
 
        public CPUCoreChart() {
                chartType = TimelineConstants.CHART_TYPE_CPU_CORE;
+               probeType = TimelineUtils.getProbeID(chartType);
                chartName = TimelineChartLabels.CPU_CORE_CHART_TITLE;
                chartIcon = ImageResources.CHART_CPU_CORE;
                addIcon = ImageResources.ADD_CHART_CPU_CORE;
@@ -151,7 +153,7 @@ public class CPUCoreChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if (!isAbleToParse(logPack, probeType)) {
                        return;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java
index ce36ee0..1bf5b3e 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUFrequencyChart.java
@@ -38,6 +38,7 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
+import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeriesItem;
@@ -56,6 +57,7 @@ public class CPUFrequencyChart extends TimelineChart {
 
        private CPUFrequencyChart() {
                chartType = TimelineConstants.CHART_TYPE_CPU_FREQUENCY;
+               probeType = TimelineUtils.getProbeID(chartType);
                chartName = TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE;
                chartIcon = ImageResources.CHART_CPU_FREQUENCY;
                addIcon = ImageResources.ADD_CHART_CPU_FREQUENCY;
@@ -83,7 +85,7 @@ public class CPUFrequencyChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if (!isAbleToParse(logPack, probeType)) {
                        return;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java
index 4e90a6e..53ca335 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/FileChart.java
@@ -38,6 +38,7 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
+import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeriesItem;
@@ -70,6 +71,7 @@ public class FileChart extends TimelineChart {
 
        private FileChart() {
                chartType = TimelineConstants.CHART_TYPE_FILE;
+               probeType = TimelineUtils.getProbeID(chartType);
                chartName = TimelineChartLabels.FILE_CHART_TITLE;
                chartIcon = ImageResources.CHART_FILE;
                addIcon = ImageResources.ADD_CHART_FILE;
@@ -118,7 +120,7 @@ public class FileChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if(!isAbleToParse(logPack, probeType)) {
                        return;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java
index ea2aee0..a2ea1ae 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/HeapChart.java
@@ -39,6 +39,7 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
+import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeriesItem;
@@ -67,6 +68,7 @@ public class HeapChart extends TimelineChart {
 
        private HeapChart() {
                chartType = TimelineConstants.CHART_TYPE_HEAP;
+               probeType = TimelineUtils.getProbeID(chartType);
                chartName = TimelineChartLabels.HEAP_CHART_TITLE;
                chartIcon = ImageResources.CHART_HEAP;
                addIcon = ImageResources.ADD_CHART_HEAP;
@@ -99,7 +101,7 @@ public class HeapChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if (!isAbleToParse(logPack, probeType)) {
                        return;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java
index 5eb5ae7..b565c67 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ProcessMemoryChart.java
@@ -38,6 +38,7 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
+import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeriesItem;
@@ -59,6 +60,7 @@ public class ProcessMemoryChart extends TimelineChart {
 
        private ProcessMemoryChart() {
                chartType = TimelineConstants.CHART_TYPE_PROCESS_MEMORY;
+               probeType = TimelineUtils.getProbeID(chartType);
                chartName = TimelineChartLabels.PROCESS_MEMORY_CHART_TITLE;
                chartIcon = ImageResources.CHART_PROCESS_MEMORY;
                addIcon = ImageResources.ADD_CHART_PROCESS_MEMORY;
@@ -97,7 +99,7 @@ public class ProcessMemoryChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if (!isAbleToParse(logPack, probeType)) {
                        return;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java
index d5a606c..7afe1b8 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/ScreenshotChart.java
@@ -122,7 +122,7 @@ public class ScreenshotChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                // TODO Auto-generated method stub
        }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java
index defdc40..6411397 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/SystemMemoryChart.java
@@ -39,6 +39,7 @@ import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
+import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeries;
 import org.tizen.dynamicanalyzer.widgets.chart.DACustomChartSeriesItem;
@@ -60,6 +61,7 @@ public class SystemMemoryChart extends TimelineChart {
 
        private SystemMemoryChart() {
                chartType = TimelineConstants.CHART_TYPE_SYSTEM_MEMORY;
+               probeType = TimelineUtils.getProbeID(chartType);
                chartName = TimelineChartLabels.SYSTEM_MEMORY_CHART_TITLE;
                chartIcon = ImageResources.CHART_SYSTEM_MEMORY;
                addIcon = ImageResources.ADD_CHART_SYSTEM_MEMORY;
@@ -99,7 +101,7 @@ public class SystemMemoryChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if (!isAbleToParse(logPack, probeType)) {
                        return;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/TimelineChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/TimelineChart.java
index 3ad1b89..f254c03 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/TimelineChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/TimelineChart.java
@@ -44,12 +44,13 @@ public abstract class TimelineChart {
        protected DACustomChartPlot plot;
        
        protected int chartType;
+       protected int  probeType;
        protected String chartName;
        protected Image chartIcon;
        protected Image addIcon;
        protected int size = TimelineConstants.ITEM_HEIGHT_DEF;
 
-       public abstract void parsingLogPackage(LogPackage logPack, int probeType);
+       public abstract void parsingLogPackage(LogPackage logPack);
        public abstract void clear();
        public abstract DACustomChart createDAChart(Composite parent);
        public abstract List<DACustomChartSeries> getBaseDASeriesList();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java
index 9e7b5ee..1302978 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/UIEventChart.java
@@ -52,15 +52,22 @@ public class UIEventChart extends TimelineChart {
        private DACustomChartSeries frameworkEventSeries;
 
        private final int EVENT_TYPE = 12;
+       private final int DETAIL_TYPE = 13;
        private final int X = 14;
        private final int Y = 15;
        private final int INFO1 = 16;
+       private final int INFO2 = 17;
 
        private final int TYPE_KEY = 1;
        private final int TYPE_TOUCH = 2;
        private final int TYPE_GESTURE = 3;
        private final int TYPE_ORIENTATION = 4;
        private final int TYPE_FRAMEWORK = 5;
+       
+       private final String SPACE = " "; // $NON_NLS-1$
+       private final String NEW_LINE = "\n"; // $NON_NLS-1$
+       private final String KEY_UP = "up"; // $NON_NLS-1$
+       private final String KEY_DOWN = "down"; // $NON_NLS-1$
 
        public static UIEventChart getInstance() {
                if (instance == null) {
@@ -122,7 +129,7 @@ public class UIEventChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if (!isAbleToParse(logPack, LogCenterConstants.LOG_RECODER)) {
                        return;
                }
@@ -136,15 +143,27 @@ public class UIEventChart extends TimelineChart {
        }
 
        private void parsingLog(List<String> log) {
-               double time = Double.parseDouble(log.get(LogCenterConstants.TIME_INDEX));
+               double time = Double.parseDouble(log.get(LogCenterConstants.TIME_INDEX)) /  TimelineConstants.MEGA;
 
                int type = Integer.parseInt(log.get(EVENT_TYPE));
+               int detailType = Integer.parseInt(log.get(DETAIL_TYPE));
                switch (type) {
                case TYPE_KEY:
-                       keyEventSeries.addSeriesItem(new DACustomChartSeriesItem(time, 0, "keycode : " + log.get(INFO1)));
+                       String keyName = log.get(INFO1);
+                       String keyStatus;
+                       if(detailType == 0) {
+                               keyStatus = KEY_DOWN;
+                       } else {
+                               keyStatus = KEY_UP;
+                       }
+                       keyEventSeries.addSeriesItem(new DACustomChartSeriesItem(time, 0, keyName + SPACE + keyStatus));
                        break;
                case TYPE_TOUCH:
-                       touchEventSeries.addSeriesItem(new DACustomChartSeriesItem(time, 0, "x : " + log.get(X) + " y : " + log.get(Y)));
+                       String info = EnumTouchStatus.values()[Integer.parseInt(log.get(DETAIL_TYPE))].getStatus() + NEW_LINE 
+                                                       + log.get(X) + NEW_LINE
+                                                       + log.get(Y) + NEW_LINE;
+//                                                     + log.get(INFO2);
+                       touchEventSeries.addSeriesItem(new DACustomChartSeriesItem(time, 0, info));
                        break;
                case TYPE_GESTURE:
                        // FIXME detail event
@@ -174,4 +193,25 @@ public class UIEventChart extends TimelineChart {
 
                return seriesList;
        }
+       
+       enum EnumTouchStatus {
+               PRESSED("Pressed"),
+               LONG_PRESSED("Long pressed"),
+               RELEASED("Released"),
+               MOVED("Moved"),
+               DOUBLE_PRESSED("Double pressed"),
+               FOCUS_IN("Focus in"),
+               FOCUS_OUT("Focus out"),
+               CANCELED("Canceled");
+               
+               private String status;
+               
+               private EnumTouchStatus(String status) {
+                       this.status = status;
+               }
+               
+               public String getStatus() {
+                       return status;
+               }
+       }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineRangeSelector.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineRangeSelector.java
index f5fc204..b526500 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineRangeSelector.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineRangeSelector.java
@@ -49,18 +49,21 @@ import org.tizen.dynamicanalyzer.ui.widgets.DAScaleRenderer;
 import org.tizen.dynamicanalyzer.widgets.scale.DAScale;
 import org.tizen.dynamicanalyzer.widgets.scale.DAScaleSelectionListener;
 
-public class TimelineRangeSelector {
+public class TimelineRangeSelector extends Composite {
+
        private final int MAX_SCALE = 2;
 
-       private Composite scaleAndRangeComp;
-       private Composite rangeScaleComp;
-       private Composite rangeSelectorComp;
        private DAScale rangeScale;
        private ScrollBar rangeScrollBar;
+       
+       public TimelineRangeSelector(Composite parent) {
+               super(parent, SWT.NONE);
+               
+               createScaleAndRangeComp();
+       }
 
-       public Composite createScaleAndRangeComp(Composite baseComp) {
-               scaleAndRangeComp = new Composite(baseComp, SWT.NONE);
-               scaleAndRangeComp.setBackground(ColorResources.VIEW_BG_COLOR);
+       private void createScaleAndRangeComp() {
+               setBackground(ColorResources.VIEW_BG_COLOR);
 
                GridLayout gLayout = new GridLayout(3, false);
                gLayout.marginWidth = 0;
@@ -69,10 +72,10 @@ public class TimelineRangeSelector {
                gLayout.verticalSpacing = 0;
                gLayout.marginTop = 1;
                gLayout.marginBottom = 1;
-               scaleAndRangeComp.setLayout(gLayout);
+               setLayout(gLayout);
                
                /* Scale */
-               rangeScaleComp = createRangeScaleComp(scaleAndRangeComp, SWT.None);
+               final Composite rangeScaleComp = createRangeScaleComp();
                GridData gDataInfo = new GridData();
                gDataInfo.widthHint = TimelineConstants.TIMELINE_ITEM_INFO_WIDTH;
                gDataInfo.verticalAlignment = GridData.FILL;
@@ -87,7 +90,7 @@ public class TimelineRangeSelector {
                });
 
                // /* Range */
-               rangeSelectorComp = createRangeComp(scaleAndRangeComp);
+               Composite rangeSelectorComp = createRangeComp();
                GridData gDataChart = new GridData();
                gDataChart.horizontalAlignment = GridData.FILL;
                gDataChart.grabExcessHorizontalSpace = true;
@@ -108,18 +111,16 @@ public class TimelineRangeSelector {
                });
 
                /* Empty area */
-               Label empty = new Label(scaleAndRangeComp, SWT.NONE);
+               Label empty = new Label(this, SWT.NONE);
                GridData gDataEmpty = new GridData();
                gDataEmpty.widthHint = TimelineConstants.ITEM_LIST_EDITOR_BTN_WIDTH;
                gDataEmpty.verticalAlignment = GridData.FILL;
                gDataEmpty.grabExcessVerticalSpace = true;
                empty.setLayoutData(gDataEmpty);
-
-               return scaleAndRangeComp;
        }
 
-       private Composite createRangeScaleComp(Composite selectorComp, int style) {
-               Composite rangeScaleComp = new Composite(selectorComp, SWT.None);
+       private Composite createRangeScaleComp() {
+               Composite rangeScaleComp = new Composite(this, SWT.None);
                rangeScaleComp.setLayout(new FillLayout());
                rangeScale = new DAScale(rangeScaleComp, SWT.NONE);
 
@@ -152,8 +153,8 @@ public class TimelineRangeSelector {
                return rangeScaleComp;
        }
 
-       private Composite createRangeComp(Composite parent) {
-               ScrolledComposite rangeSelectorComp = new ScrolledComposite(parent, SWT.H_SCROLL);
+       private Composite createRangeComp() {
+               ScrolledComposite rangeSelectorComp = new ScrolledComposite(this, SWT.H_SCROLL);
                rangeSelectorComp.setAlwaysShowScrollBars(true);
                rangeSelectorComp.setLayout(new FillLayout());
                rangeSelectorComp.setBackground(ColorResources.VIEW_BG_COLOR);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java
index ae684a4..92a9a43 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineView.java
@@ -44,23 +44,20 @@ import org.tizen.dynamicanalyzer.model.DAView;
 import org.tizen.dynamicanalyzer.model.SnapshotData;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart;
+import org.tizen.dynamicanalyzer.ui.timeline.chart.UIEventChart;
 import org.tizen.dynamicanalyzer.ui.timeline.custom.CustomLogParser;
 import org.tizen.dynamicanalyzer.ui.timeline.lifecycle.LifecycleLogParser;
 import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
-import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 
 public class TimelineView extends DAView {
        public static final String ID = TimelineView.class.getName();
        private final int RANGE_SELECTOR_SCALE_HEIGHT = 20;
 
-       private TimelineView baseShellComp;
        private TimelineAndMenuComposite timelineAndMenuComp;
        private ScrolledComposite itemsAreaScrolledComp;
-       private Composite scaleAndRangeComp;
        private Composite itemsAreaComp;
 
-       private TimelineRangeSelector timelineRangeSelector;
        private TimelineItemManager timelineItemManager = TimelineItemManager.getInstance();
        private TimelineChartManager chartManager = TimelineChartManager.getInstance();
        private CustomLogParser customLogParser = new CustomLogParser();
@@ -69,9 +66,6 @@ public class TimelineView extends DAView {
        private Listener compositeResizeListener = new Listener() {
                @Override
                public void handleEvent(Event event) {
-                       if (null == baseShellComp) {
-                               return;
-                       }
                        resizeBaseAreaHeight();
                }
        };
@@ -79,11 +73,9 @@ public class TimelineView extends DAView {
        public TimelineView(Composite parent, int style) {
                super(parent, style);
 
-               timelineRangeSelector = new TimelineRangeSelector();
-
-               baseShellComp = (TimelineView) createBaseComp(this);
-               baseShellComp.setBackground(ColorResources.VIEW_BG_COLOR);
-               AnalyzerUtil.setTimelineComposite(baseShellComp);
+               createBaseComp();
+               setBackground(ColorResources.VIEW_BG_COLOR);
+               AnalyzerUtil.setTimelineComposite(this);
        }
 
        private void updateComposite() {
@@ -121,30 +113,27 @@ public class TimelineView extends DAView {
                resizeBaseAreaHeight();
        }
 
-       private Composite createBaseComp(Composite parent) {
+       private void createBaseComp() {
                /* Container */
                GridLayout gLayout = new GridLayout(1, false);
                gLayout.marginWidth = 0;
                gLayout.marginHeight = 0;
                gLayout.horizontalSpacing = 0;
                gLayout.verticalSpacing = 0;
-               parent.setLayout(gLayout);
-               parent.addListener(SWT.Resize, compositeResizeListener);
+               setLayout(gLayout);
+               addListener(SWT.Resize, compositeResizeListener);
 
                /* time and menu */
-               timelineAndMenuComp = new TimelineAndMenuComposite(parent);
+               timelineAndMenuComp = new TimelineAndMenuComposite(this);
                setLayoutDataBaseComp(timelineAndMenuComp, true, false, true);
 
                /* ItemsArea */
-               itemsAreaScrolledComp = createItemsAreaScrolledComp(parent);
+               itemsAreaScrolledComp = createItemsAreaScrolledComp(this);
                setLayoutDataBaseComp(itemsAreaScrolledComp, true, true, false);
 
                /* RangeSelector */
-               scaleAndRangeComp = timelineRangeSelector
-                               .createScaleAndRangeComp(parent);
+               Composite scaleAndRangeComp = new TimelineRangeSelector(this);
                setLayoutDataBaseComp(scaleAndRangeComp, true, false, true);
-
-               return parent;
        }
 
        private void setLayoutDataBaseComp(Composite comp, boolean h_space,
@@ -265,14 +254,13 @@ public class TimelineView extends DAView {
                if(deviceLogs != null && deviceLogs.getLogs() != null && deviceLogs.getLogs().size() > 0) {
                        List<TimelineChart> chartList = chartManager.getChartList();
                        for(TimelineChart chart : chartList) {
-                               int probeType = TimelineUtils.getProbeID(chart.getChartType());
-                               chart.parsingLogPackage(logPack, probeType);
+                               chart.parsingLogPackage(logPack);
                        }
                }
                
                Logs recorderLogs = logPack.getLogs(LogCenterConstants.LOG_RECODER);
                if(recorderLogs != null && recorderLogs.getLogs() != null && recorderLogs.getLogs().size() >0) {
-                       //TODO ui event log parser
+                       UIEventChart.getInstance().parsingLogPackage(logPack);
                }
                
                Logs customLogs = logPack.getLogs(LogCenterConstants.LOG_CUSTOM_CHART);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/custom/UserCustomChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/custom/UserCustomChart.java
index 51384e9..512c59c 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/custom/UserCustomChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/custom/UserCustomChart.java
@@ -76,7 +76,7 @@ public class UserCustomChart extends TimelineChart {
        }
 
        @Override
-       public void parsingLogPackage(LogPackage logPack, int probeType) {
+       public void parsingLogPackage(LogPackage logPack) {
                if (!isAbleToParse(logPack, LogCenterConstants.LOG_DEVICE)) {
                        return;
                }

diff --git a/org.tizen.dynamicanalyzer/theme/white/img/test_image_blue.png b/org.tizen.dynamicanalyzer/theme/white/img/test_image_blue.png
index 3180b10..44528d4 100644 (file)
Binary files a/org.tizen.dynamicanalyzer/theme/white/img/test_image_blue.png and b/org.tizen.dynamicanalyzer/theme/white/img/test_image_blue.png differ

diff --git a/org.tizen.dynamicanalyzer/theme/white/img/test_image_red.png b/org.tizen.dynamicanalyzer/theme/white/img/test_image_red.png
index 500966c..b9f5de7 100644 (file)
Binary files a/org.tizen.dynamicanalyzer/theme/white/img/test_image_red.png and b/org.tizen.dynamicanalyzer/theme/white/img/test_image_red.png differ