[SRADA-794] Chage color, height of timeline

Change-Id: Ica89f8922a05e3457f26206819947b8578508d58

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java
index 1d5ba73..3e4abc7 100644 (file)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeFlat.java
@@ -395,10 +395,10 @@ public class DAThemeFlat extends DATheme {
                setColor("time_tick_bg", new RGB(247, 247, 247)); //$NON-NLS-1$
                setColor("time_tick_line", new RGB(159, 159, 159)); //$NON-NLS-1$
 
-               setColor("lifecycle_initializing", new RGB(123, 182, 240)); //$NON-NLS-1$    
-               setColor("lifecycle_running", new RGB(194, 238, 131)); //$NON-NLS-1$    
-               setColor("lifecycle_pausing", new RGB(190, 190, 190)); //$NON-NLS-1$    
-               setColor("lifecycle_terminating", new RGB(223, 143, 140)); //$NON-NLS-1$    
+               setColor("lifecycle_initializing", new RGB(32, 212, 204)); //$NON-NLS-1$    
+               setColor("lifecycle_running", new RGB(78, 118, 248)); //$NON-NLS-1$    
+               setColor("lifecycle_pausing", new RGB(229, 101, 173)); //$NON-NLS-1$    
+               setColor("lifecycle_terminating", new RGB(255, 181, 109)); //$NON-NLS-1$    
 
                setColor("add_chart_normal_stroke", new RGB(168, 168, 168)); //$NON-NLS-1$
                setColor("add_chart_hover_stroke", new RGB(47, 85, 92)); //$NON-NLS-1$

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
index 0ef4a46..59d49de 100644 (file)
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
@@ -187,6 +187,7 @@ public class DAChartBoard extends Composite {
                        lifecycleBar = new LifecycleBar(this);
                        lifecycleBarTooltip = new DefaultToolTip(lifecycleBar);
                        lifecycleBarTooltip.deactivate();
+                       lifecycleBar.setBackground(ColorResources.GRAY_245);
                        lifecycleBar.addMouseTrackListener(timelineMouseTrackAdapter);
 
                        if (boardStyle == BOARD_STYLE_KERNEL) {

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/lifecycle/LifecycleBar.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/lifecycle/LifecycleBar.java
index 058f56f..2524c3a 100644 (file)
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/lifecycle/LifecycleBar.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/lifecycle/LifecycleBar.java
@@ -42,7 +42,7 @@ import org.tizen.dynamicanalyzer.widgets.timeline.DATimeline;
 import org.tizen.dynamicanalyzer.widgets.timeline.DATimelineRenderer;
 
 public class LifecycleBar extends Canvas {
-       public static final int HEIGHT = 5;
+       public static final int HEIGHT = 7;
        private double visibleStartTime = 0;
        private double totalEndTime = 0;
        private int scale = DATimeline.SCALE_100;

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timeline/DATimelineTimeRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timeline/DATimelineTimeRenderer.java
index 42d589a..fc32c73 100644 (file)
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timeline/DATimelineTimeRenderer.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/timeline/DATimelineTimeRenderer.java
@@ -43,8 +43,9 @@ public class DATimelineTimeRenderer extends DATimelineRenderer {
        protected final int balloonHalfWidth = balloon.getBounds().width / 2;
        protected final int balloonHalfHeight = balloon.getBounds().height / 2;
 
-       protected static final int TICK_LINE_HEIGHT_TALL = 4;
-       protected static final int TICK_LINE_HEIGHT_SMALL = 2;
+       protected static final int TIME_LINE_MID_LINE_HEIGHT = 1;
+       protected static final int TICK_LINE_HEIGHT_TALL = 6;
+       protected static final int TICK_LINE_HEIGHT_SMALL = 4;
        protected static final int TIME_STRING_PIXEL_Y = 4;
        protected static final int MARKER_START_Y = 5;
        
@@ -78,14 +79,14 @@ public class DATimelineTimeRenderer extends DATimelineRenderer {
        public void draw(GC gc, DATimeline timeline) {
                Rectangle rt = timeline.getClientArea();
                gc.setFont(timeTickFont);
-               gc.setBackground(ColorResources.TIMELINE_BG_COLOR);
+               gc.setBackground(ColorResources.GRAY_245);
                gc.fillRectangle(rt);
 
                gc.setForeground(ColorResources.TIMELINE_TICK_COLOR);
                // draw headLine
                gc.drawLine(0, 0, rt.width, 0);
                // draw underLine
-               gc.drawLine(0, rt.height - 1, rt.width, rt.height - 1);
+               gc.drawLine(0, rt.height - TIME_LINE_MID_LINE_HEIGHT , rt.width, rt.height - TIME_LINE_MID_LINE_HEIGHT);
 
                // draw time
                int pixelX = 0;
@@ -99,19 +100,19 @@ public class DATimelineTimeRenderer extends DATimelineRenderer {
                        if (startTime % 10 == 0) {
                                drawTimeString(gc, startTime, pixelX, TIME_STRING_PIXEL_Y);
                                gc.drawLine(pixelX, rt.height - TICK_LINE_HEIGHT_TALL,
-                                               pixelX, rt.height - 1);
+                                               pixelX, rt.height - TIME_LINE_MID_LINE_HEIGHT);
                        } else if (startTime % 5 == 0) {
                                if (scale >= DATimeline.SCALE_400) {
                                        drawTimeString(gc, startTime, pixelX, TIME_STRING_PIXEL_Y);
                                }
                                gc.drawLine(pixelX, rt.height - TICK_LINE_HEIGHT_TALL, pixelX,
-                                               rt.height - 1);
+                                               rt.height - TIME_LINE_MID_LINE_HEIGHT);
                        } else {
                                if (scale >= DATimeline.SCALE_800) {
                                        drawTimeString(gc, startTime, pixelX, TIME_STRING_PIXEL_Y);
                                }
                                gc.drawLine(pixelX, rt.height - TICK_LINE_HEIGHT_SMALL,
-                                               pixelX, rt.height - 1);
+                                               pixelX, rt.height - TIME_LINE_MID_LINE_HEIGHT);
                        }
                }