[Title] Modify bound line

[Desc.] Modify bound line color and position in opengl page
[Issue]

diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java
index dd1f1cd..d4611e9 100644 (file)
--- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java
+++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java
@@ -712,11 +712,11 @@ public class DAChartRenderer {
                                if(boundType != null) {
                                        if(boundType == DAChartPlot.BoundType.UNDER) {
                                                if(seriesItem.getY() < boundValue) {
-                                                       gc.setBackground(ColorResources.YELLOW);
+                                                       gc.setBackground(ColorResources.DARK_YELLOW);
                                                }
                                        } else {
                                                if(seriesItem.getY() > boundValue) {
-                                                       gc.setBackground(ColorResources.YELLOW);
+                                                       gc.setBackground(ColorResources.DARK_YELLOW);
                                                }
                                        }
                                }

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 d0f8e08..c3ff4ea 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
@@ -39,6 +39,7 @@ public class ColorResources {
        public static final Color RED = getColor("red", new RGB(255, 0, 0)); //$NON-NLS-1$\r
        public static final Color PURPLE = getColor("PUPLE", new RGB(226, 101, 225)); //$NON-NLS-1$\r
        public static final Color YELLOW = getColor("yellow", new RGB(250, 210, 10)); //$NON-NLS-1$\r
+       public static final Color DARK_YELLOW = getColor("dark_yellow", new RGB(219, 192, 10)); //$NON-NLS-1$\r
 \r
        // scale widget\r
        public static Color SCALE_OUTLINE_COLOR = getColor(\r

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 486ac7e..0d15a6f 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
@@ -36,6 +36,7 @@ public class ColorResources {
        public static final Color BLUE = getColor("blue"); //$NON-NLS-1$\r
        public static final Color RED = getColor("red"); //$NON-NLS-1$\r
        public static final Color YELLOW = getColor("yellow"); //$NON-NLS-1$\r
+       public static final Color DARK_YELLOW = getColor("dark_yellow"); //$NON-NLS-1$\r
        public static final Color PURPLE = getColor("purple"); //$NON-NLS-1$\r
 \r
        public static final Color GREEN = getColor("green"); //$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 849cd3e..288698f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java
@@ -47,6 +47,7 @@ public class DAThemeBlack extends DATheme {
                setColor("blue", new RGB(0, 102, 134));
                setColor("green", new RGB(68, 98, 12));
                setColor("yellow", new RGB(255, 210, 10));
+               setColor("dark_yellow", new RGB(147, 120, 0));
                setColor("purple", new RGB(139, 42, 118));
                setColor("brown", new RGB(138, 83, 0));
                setColor("navy", new RGB(57, 66, 161));

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 3271165..4b9c5f3 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
@@ -47,6 +47,7 @@ public class DAThemeWhite extends DATheme {
                setColor("blue", new RGB(0, 102, 134));
                setColor("green", new RGB(68, 98, 12));
                setColor("yellow", new RGB(255, 210, 10));
+               setColor("dark_yellow", new RGB(147, 120, 0));
                setColor("purple", new RGB(139, 42, 118));
                setColor("brown", new RGB(138, 83, 0));
                setColor("navy", new RGB(57, 66, 161));

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/BoundLineEventListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/BoundLineEventListener.java
index 81d8a13..90049b6 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/BoundLineEventListener.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/eventListner/BoundLineEventListener.java
@@ -48,11 +48,11 @@ public class BoundLineEventListener implements MouseListener, MouseMoveListener,
                MouseTrackListener {
        private static final int POINT_MAX_SIZE = 12;
        private static final int HOLE_INIT_SIZE = -4;
-       private static final int LINE_MAX_WIDTH = 3;
-       private static final int LINE_INIT_WIDTH = 1;
+       private static final int LINE_MAX_WIDTH = 4;
+       private static final int LINE_INIT_WIDTH = 2;
        private static final double UPPER_LINE_INIT_POSITION = 0.01;
        private static final double UNDER_LINE_INIT_POSITION = 0.99;
-       private static final Color LINE_COLOR = ColorResources.BLUE;
+       private static final Color LINE_COLOR = ColorResources.DARK_YELLOW;
 
        private DAChart chart;
        private DAChartPlot plot;
@@ -76,7 +76,7 @@ public class BoundLineEventListener implements MouseListener, MouseMoveListener,
                        public void paintControl(PaintEvent e) {
                                double max = plot.getVisibleEndY();
                                if(boundType == BoundType.UPPER && !isDirty) {
-                                       boundValue = max;
+                                       boundValue = max * 0.9;
                                        plot.setBoundValue(boundValue);
                                }