[Title] theme color : timeline chart, range selection

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ColorResources.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ColorResources.java
index 32100df..8868822 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ColorResources.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ColorResources.java
@@ -289,37 +289,40 @@ public class ColorResources {
        public static Color PROFILING_GRAPH_SELECTION_COLOR_START = getColor("profiling_graph_selection_color_start"); //$NON-NLS-1$\r
        public static Color PROFILING_GRAPH_SELECTION_COLOR_END = getColor("profiling_graph_selection_color_end"); //$NON-NLS-1$\r
 \r
+       // Add Chart\r
+       public static Color ADD_CHART_ENABLE_COLOR_START = getColor("add_chart_enable_color_start"); //$NON-NLS-1$\r
+       public static Color ADD_CHART_ENABLE_COLOR_END = getColor("add_chart_enable_color_end"); //$NON-NLS-1$\r
+       public static Color ADD_CHART_DISABLE_COLOR_START = getColor("add_chart_disable_color_start"); //$NON-NLS-1$\r
+       public static Color ADD_CHART_DISABLE_COLOR_END = getColor("add_chart_disable_color_end"); //$NON-NLS-1$\r
+       \r
        /** timeline chart **/\r
-       public static Color SERIESE_COLOR_CPU_SYSTEM = getColor("seriesColorCPUSystem");\r
-       public static Color SERIESE_COLOR_CPU_APP = getColor("seriesColorCPUApp");\r
+       public static Color SERIESE_COLOR_CPU_SYSTEM = getColor("seriesColorCPUSystem"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_CPU_APP = getColor("seriesColorCPUApp"); //$NON-NLS-1$\r
        \r
-       public static Color SERIESE_COLOR_CPUCORE_CORE0 = getColor("seriesColorCPUCoreCore0");\r
-       public static Color SERIESE_COLOR_CPUCORE_CORE1 = getColor("seriesColorCPUCoreCore1");\r
-       public static Color SERIESE_COLOR_CPUCORE_CORE2 = getColor("seriesColorCPUCoreCore2");\r
-       public static Color SERIESE_COLOR_CPUCORE_CORE3 = getColor("seriesColorCPUCoreCore3");\r
+       public static Color SERIESE_COLOR_CPUCORE_CORE0 = getColor("seriesColorCPUCoreCore0"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_CPUCORE_CORE1 = getColor("seriesColorCPUCoreCore1"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_CPUCORE_CORE2 = getColor("seriesColorCPUCoreCore2"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_CPUCORE_CORE3 = getColor("seriesColorCPUCoreCore3"); //$NON-NLS-1$\r
        \r
-       public static Color SERIESE_COLOR_CPU_FREQ = getColor("seriesColorCPUFreq");\r
+       public static Color SERIESE_COLOR_CPU_FREQ = getColor("seriesColorCPUFreq"); //$NON-NLS-1$\r
        \r
-       public static Color SERIESE_COLOR_HEAP_SYSTEM = getColor("seriesColorHeapSystem");\r
-       public static Color SERIESE_COLOR_HEAP_USER = getColor("seriesColorHeapApp");\r
+       public static Color SERIESE_COLOR_HEAP_SYSTEM = getColor("seriesColorHeapSystem"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_HEAP_USER = getColor("seriesColorHeapApp"); //$NON-NLS-1$\r
 \r
-       public static Color SERIESE_COLOR_PROCESS_VSS = getColor("seriesColorProcessVSS");\r
-       public static Color SERIESE_COLOR_PROCESS_RSS = getColor("seriesColorProcessRSS");\r
-       public static Color SERIESE_COLOR_PROCESS_PSS = getColor("seriesColorProcessPSS");\r
+       public static Color SERIESE_COLOR_PROCESS_VSS = getColor("seriesColorProcessVSS"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_PROCESS_RSS = getColor("seriesColorProcessRSS"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_PROCESS_PSS = getColor("seriesColorProcessPSS"); //$NON-NLS-1$\r
        \r
-       public static Color SERIESE_COLOR_MEMORY_SYS_MAX = getColor("seriesColorMemorySysMax");\r
-       public static Color SERIESE_COLOR_MEMORY_SYS_USED = getColor("seriesColorMemorySysUsed");\r
-       public static Color SERIESE_COLOR_MEMORY_APP_USED = getColor("seriesColorMemoryAppUsed");\r
+       public static Color SERIESE_COLOR_MEMORY_SYS_MAX = getColor("seriesColorMemorySysMax"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_MEMORY_SYS_USED = getColor("seriesColorMemorySysUsed"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_MEMORY_APP_USED = getColor("seriesColorMemoryAppUsed"); //$NON-NLS-1$\r
        \r
-       public static Color SERIESE_COLOR_FILE_READ = getColor("seriesColorFileRead");\r
-       public static Color SERIESE_COLOR_FILE_WRITE = getColor("seriesColorFileWrite");\r
-       public static Color SERIESE_COLOR_FILE_FD = getColor("seriesColorFileFD");\r
+       public static Color SERIESE_COLOR_FILE_READ = getColor("seriesColorFileRead"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_FILE_WRITE = getColor("seriesColorFileWrite"); //$NON-NLS-1$\r
+       public static Color SERIESE_COLOR_FILE_FD = getColor("seriesColorFileFD"); //$NON-NLS-1$\r
        \r
-       // Add Chart\r
-       public static Color ADD_CHART_ENABLE_COLOR_START = getColor("add_chart_enable_color_start"); //$NON-NLS-1$\r
-       public static Color ADD_CHART_ENABLE_COLOR_END = getColor("add_chart_enable_color_end"); //$NON-NLS-1$\r
-       public static Color ADD_CHART_DISABLE_COLOR_START = getColor("add_chart_disable_color_start"); //$NON-NLS-1$\r
-       public static Color ADD_CHART_DISABLE_COLOR_END = getColor("add_chart_disable_color_end"); //$NON-NLS-1$\r
+       public static Color SELECTION_RANGE = getColor("selectionRange"); //$NON-NLS-1$\r
+       public static Color SELECTION_LINE = getColor("selectionLine"); //$NON-NLS-1$\r
 \r
        public static void initColors() {\r
                // shell window background color\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 cefcba6..36c542a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeBlack.java
@@ -256,6 +256,27 @@ public class DAThemeBlack extends DATheme {
                setColor("profiling_graph_selection_color_start", new RGB(255, 135, 82)); //$NON-NLS-1$
                setColor("profiling_graph_selection_color_end", new RGB(232, 73, 73)); //$NON-NLS-1$
 
+               // bar graph
+               setColor("cpu_bar_graph_color", new RGB(0, 122, 167)); //$NON-NLS-1$
+               setColor("cpu_bar_graph_gray_color", new RGB(222, 222, 222));
+               setColor("cpu_bar_graph_bg_color", new RGB(255, 255, 255));
+
+               setColor("process_bar_graph_color", new RGB(119, 163, 0)); //$NON-NLS-1$
+               setColor("process_bar_graph_center_color", new RGB(230, 230, 230)); //$NON-NLS-1$
+               setColor("process_bar_graph_bg_color", new RGB(79, 79, 81)); //$NON-NLS-1$
+
+               setColor("profiling_graph_color_start", new RGB(145, 190, 3)); //$NON-NLS-1$
+               setColor("profiling_graph_color_end", new RGB(114, 149, 1)); //$NON-NLS-1$
+
+               setColor("profiling_graph_selection_color_start", new RGB(255, 135, 82)); //$NON-NLS-1$
+               setColor("profiling_graph_selection_color_end", new RGB(232, 73, 73)); //$NON-NLS-1$
+               
+               // Add Chart
+               setColor("add_chart_enable_color_start", new RGB(131, 196, 218)); //$NON-NLS-1$
+               setColor("add_chart_enable_color_end", new RGB(38, 104, 138)); //$NON-NLS-1$
+               setColor("add_chart_disable_color_start", new RGB(123, 124, 124)); //$NON-NLS-1$
+               setColor("add_chart_disable_color_end", new RGB(244, 244, 244)); //$NON-NLS-1$
+               
                /** Timeline chart **/
                setColor("seriesColorCPUSystem", new RGB(212, 150, 57)); //$NON-NLS-1$
                setColor("seriesColorCPUApp", new RGB(1, 102, 134)); //$NON-NLS-1$
@@ -281,27 +302,9 @@ public class DAThemeBlack extends DATheme {
                setColor("seriesColorFileRead", new RGB(126, 41, 2)); //$NON-NLS-1$
                setColor("seriesColorFileWrite", new RGB(27, 110, 92)); //$NON-NLS-1$
                setColor("seriesColorFileFD", new RGB(129, 172, 50)); //$NON-NLS-1$
-               // bar graph
-               setColor("cpu_bar_graph_color", new RGB(0, 122, 167)); //$NON-NLS-1$
-               setColor("cpu_bar_graph_gray_color", new RGB(222, 222, 222));
-               setColor("cpu_bar_graph_bg_color", new RGB(255, 255, 255));
-
-               setColor("process_bar_graph_color", new RGB(119, 163, 0)); //$NON-NLS-1$
-               setColor("process_bar_graph_center_color", new RGB(230, 230, 230)); //$NON-NLS-1$
-               setColor("process_bar_graph_bg_color", new RGB(79, 79, 81)); //$NON-NLS-1$
-
-               setColor("profiling_graph_color_start", new RGB(145, 190, 3)); //$NON-NLS-1$
-               setColor("profiling_graph_color_end", new RGB(114, 149, 1)); //$NON-NLS-1$
-
-               setColor("profiling_graph_selection_color_start", new RGB(255, 135, 82)); //$NON-NLS-1$
-               setColor("profiling_graph_selection_color_end", new RGB(232, 73, 73)); //$NON-NLS-1$
                
-               // Add Chart
-               setColor("add_chart_enable_color_start", new RGB(131, 196, 218)); //$NON-NLS-1$
-               setColor("add_chart_enable_color_end", new RGB(38, 104, 138)); //$NON-NLS-1$
-               setColor("add_chart_disable_color_start", new RGB(123, 124, 124)); //$NON-NLS-1$
-               setColor("add_chart_disable_color_end", new RGB(244, 244, 244)); //$NON-NLS-1$
-
+               setColor("selectionRange", new RGB(193, 253, 255)); //$NON-NLS-1$
+               setColor("selectionLine", new RGB(193, 253, 255)); //$NON-NLS-1$
        }
 
        public Color getColor(String colorName, RGB rgb) {

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 3223b19..b09f121 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
@@ -249,6 +249,27 @@ public class DAThemeWhite extends DATheme {
                setColor("defaultBackground", new RGB(255, 255, 255)); //$NON-NLS-1$
                setColor("defaultRed", new RGB(173, 13, 1)); //$NON-NLS-1$
                
+               // bar graph
+               setColor("cpu_bar_graph_color", new RGB(0, 122, 167)); //$NON-NLS-1$
+               setColor("cpu_bar_graph_gray_color", new RGB(222, 222, 222));
+               setColor("cpu_bar_graph_bg_color", new RGB(255, 255, 255));
+
+               setColor("process_bar_graph_color", new RGB(119, 163, 0)); //$NON-NLS-1$
+               setColor("process_bar_graph_center_color", new RGB(230, 230, 230)); //$NON-NLS-1$
+               setColor("process_bar_graph_bg_color", new RGB(79, 79, 81)); //$NON-NLS-1$
+
+               setColor("profiling_graph_color_start", new RGB(145, 190, 3)); //$NON-NLS-1$
+               setColor("profiling_graph_color_end", new RGB(114, 149, 1)); //$NON-NLS-1$
+
+               setColor("profiling_graph_selection_color_start", new RGB(255, 135, 82)); //$NON-NLS-1$
+               setColor("profiling_graph_selection_color_end", new RGB(232, 73, 73)); //$NON-NLS-1$
+
+               // Add Chart
+               setColor("add_chart_enable_color_start", new RGB(131, 196, 218)); //$NON-NLS-1$
+               setColor("add_chart_enable_color_end", new RGB(38, 104, 138)); //$NON-NLS-1$
+               setColor("add_chart_disable_color_start", new RGB(123, 124, 124)); //$NON-NLS-1$
+               setColor("add_chart_disable_color_end", new RGB(244, 244, 244)); //$NON-NLS-1$
+               
                /** Timeline chart **/
                setColor("seriesColorCPUSystem", new RGB(111, 151, 39)); //$NON-NLS-1$
                setColor("seriesColorCPUApp", new RGB(72, 185, 221)); //$NON-NLS-1$
@@ -274,27 +295,9 @@ public class DAThemeWhite extends DATheme {
                setColor("seriesColorFileRead", new RGB(226, 109, 201)); //$NON-NLS-1$
                setColor("seriesColorFileWrite", new RGB(72, 185, 221)); //$NON-NLS-1$
                setColor("seriesColorFileFD", new RGB(111, 151, 39)); //$NON-NLS-1$
-               // bar graph
-               setColor("cpu_bar_graph_color", new RGB(0, 122, 167)); //$NON-NLS-1$
-               setColor("cpu_bar_graph_gray_color", new RGB(222, 222, 222));
-               setColor("cpu_bar_graph_bg_color", new RGB(255, 255, 255));
-
-               setColor("process_bar_graph_color", new RGB(119, 163, 0)); //$NON-NLS-1$
-               setColor("process_bar_graph_center_color", new RGB(230, 230, 230)); //$NON-NLS-1$
-               setColor("process_bar_graph_bg_color", new RGB(79, 79, 81)); //$NON-NLS-1$
-
-               setColor("profiling_graph_color_start", new RGB(145, 190, 3)); //$NON-NLS-1$
-               setColor("profiling_graph_color_end", new RGB(114, 149, 1)); //$NON-NLS-1$
-
-               setColor("profiling_graph_selection_color_start", new RGB(255, 135, 82)); //$NON-NLS-1$
-               setColor("profiling_graph_selection_color_end", new RGB(232, 73, 73)); //$NON-NLS-1$
-
-               // Add Chart
-               setColor("add_chart_enable_color_start", new RGB(131, 196, 218)); //$NON-NLS-1$
-               setColor("add_chart_enable_color_end", new RGB(38, 104, 138)); //$NON-NLS-1$
-               setColor("add_chart_disable_color_start", new RGB(123, 124, 124)); //$NON-NLS-1$
-               setColor("add_chart_disable_color_end", new RGB(244, 244, 244)); //$NON-NLS-1$
-
+               
+               setColor("selectionRange", new RGB(23, 98, 132)); //$NON-NLS-1$
+               setColor("selectionLine", new RGB(23, 98, 132)); //$NON-NLS-1$
        }
 
        public Color getColor(String colorName, RGB rgb) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TempConstants.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TempConstants.java
index 9541301..5ff5577 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TempConstants.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TempConstants.java
@@ -38,9 +38,6 @@ public class TempConstants {
                }
        }
        
-       public static final Color SELECTION_COLOR = new Color(240, 240, 240, 50);
-//     public static final Color SELECTION_COLOR = new Color(0, 45, 59, 50);
-       
        public static final double WIFI_SET_VALUE = 0.97;
        public static final double BT_SET_VALUE = 0.92;
        public static final double GPS_SET_VALUE = 0.87;
@@ -75,17 +72,5 @@ public class TempConstants {
        public static boolean SUPPORT_BLUETOOTH = false;
        public static boolean SUPPORT_GPS = false;
        
-       public static Color LINE_COLOR_GOLDENROD = new Color(212, 150, 57);
-       public static Color LINE_COLOR_TURQUOISE = new Color(72, 185, 221);
-       public static Color LINE_COLOR_VIOLET = new Color(226, 109, 201);
-       public static Color LINE_COLOR_SLATEBLUE = new Color(122, 132, 238);
-       public static Color LINE_COLOR_ORANGE = new Color(236, 107, 47);
-       public static Color LINE_COLOR_YELLOWGREEN = new Color(129, 172, 50);
-       
-       public static Color AREA_COLOR_BLUE = new Color(1, 102, 134);
-       public static Color AREA_COLOR_GREEN = new Color(68, 98, 12);
-       public static Color AREA_COLOR_PURPLE = new Color(139, 42, 118);
-       public static Color AREA_COLOR_MAROON = new Color(126, 41, 2);
-       
        public static double chartRangeRatio = 0.85;
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
index b95375f..c7f5f54 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
@@ -684,7 +684,7 @@ public class TimelineItemManager {
 
        private void initSelectionMarker() {
                selectionMarker = new IntervalMarker(-1, -1);
-               selectionMarker.setPaint(TempConstants.SELECTION_COLOR);
+               selectionMarker.setPaint(new java.awt.Color(ColorResources.SELECTION_RANGE.getRed(), ColorResources.SELECTION_RANGE.getGreen(), ColorResources.SELECTION_RANGE.getBlue(), 25));
                selectionMarker.setOutlineStroke(null);
 
                TimelineMaster.getInstance().setSelectionMarker(selectionMarker);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java
index c30097b..0440c45 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java
@@ -17,10 +17,11 @@ import org.jfree.data.time.TimeSeries;
 import org.jfree.data.xy.XYDataItem;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.experimental.swt.SWTUtils;
+import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
-import org.tizen.dynamicanalyzer.timeline.TempConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
 import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 
@@ -30,9 +31,6 @@ public class CPUChart extends TimelineChart {
        public static final String SERIES_NAME_APP_LOAD = TimelineChartLabels.CPU_CHART_SERIES_NAME_APP_LOAD;
        public static final String SERIES_NAME_TOTAL_LOAD = TimelineChartLabels.CPU_CHART_SERIES_NAME_TOTLA_LOAD;
        
-       public static final Color COLOR_APP_LOAD = TempConstants.LINE_COLOR_GOLDENROD;
-       public static final Color COLOR_TOTAL_LOAD = TempConstants.LINE_COLOR_TURQUOISE;
-
        class CPUSeriesInfo {
                private XYSeries baseSeries;
                private Vector<XYDataItem> newXYDataItems;
@@ -75,8 +73,8 @@ public class CPUChart extends TimelineChart {
        
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
-               seriesColorList.add(COLOR_TOTAL_LOAD);
-               seriesColorList.add(COLOR_APP_LOAD);
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPU_SYSTEM));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPU_APP));
                
                return seriesColorList;
        }
@@ -242,12 +240,12 @@ public class CPUChart extends TimelineChart {
 
                /* app load */
                XYAreaRenderer areaRenderer = new XYAreaRenderer();
-               areaRenderer.setSeriesPaint(0, COLOR_APP_LOAD);
+               areaRenderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPU_APP));
                xyplot.setRenderer(0, areaRenderer);
 
                /* total load */
                XYLineAndShapeRenderer lineRenderer = new XYLineAndShapeRenderer(true, false);
-               lineRenderer.setSeriesPaint(0, COLOR_TOTAL_LOAD);
+               lineRenderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPU_SYSTEM));
                xyplot.setRenderer(1, lineRenderer);
        }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java
index d74b51c..dbf3d84 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java
@@ -16,6 +16,8 @@ import org.jfree.data.time.TimeSeries;
 import org.jfree.data.xy.XYDataItem;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.experimental.swt.SWTUtils;
+import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
@@ -30,11 +32,6 @@ public class CPUCoreChart extends TimelineChart {
        public static final String SERIES_NAME_CORE2 = TimelineChartLabels.CPU_CORE_CHART_SERIES_NAME_CORE2;
        public static final String SERIES_NAME_CORE3 = TimelineChartLabels.CPU_CORE_CHART_SERIES_NAME_CORE3;
        
-       public static final Color COLOR_CORE0 = TempConstants.LINE_COLOR_VIOLET;
-       public static final Color COLOR_CORE1 = TempConstants.LINE_COLOR_SLATEBLUE;
-       public static final Color COLOR_CORE2 = TempConstants.LINE_COLOR_ORANGE;
-       public static final Color COLOR_CORE3 = TempConstants.LINE_COLOR_YELLOWGREEN;
-
        class CPUCoreSeriesInfo{
                private XYSeries baseSeries;
                private Vector<XYDataItem> newXYDataItems;
@@ -105,10 +102,10 @@ public class CPUCoreChart extends TimelineChart {
        
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
-               seriesColorList.add(COLOR_CORE0);
-               seriesColorList.add(COLOR_CORE1);
-               seriesColorList.add(COLOR_CORE2);
-               seriesColorList.add(COLOR_CORE3);
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPUCORE_CORE0));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPUCORE_CORE1));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPUCORE_CORE2));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPUCORE_CORE3));
                
                return seriesColorList;
        }
@@ -149,10 +146,10 @@ public class CPUCoreChart extends TimelineChart {
                xyplot.getRangeAxis().setRange(new Range(0, 100));
                
                XYLineAndShapeRenderer lineRenderer = new XYLineAndShapeRenderer(true, false);
-               lineRenderer.setSeriesPaint(0, COLOR_CORE0);
-               lineRenderer.setSeriesPaint(1, COLOR_CORE1);
-               lineRenderer.setSeriesPaint(2, COLOR_CORE2);
-               lineRenderer.setSeriesPaint(3, COLOR_CORE3);
+               lineRenderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPUCORE_CORE0));
+               lineRenderer.setSeriesPaint(1, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPUCORE_CORE1));
+               lineRenderer.setSeriesPaint(2, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPUCORE_CORE2));
+               lineRenderer.setSeriesPaint(3, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPUCORE_CORE3));
                xyplot.setRenderer(lineRenderer);
        }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java
index 1bf8c05..368faf1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java
@@ -16,6 +16,8 @@ import org.jfree.data.time.TimeSeries;
 import org.jfree.data.xy.XYDataItem;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.experimental.swt.SWTUtils;
+import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
@@ -27,8 +29,6 @@ public class CPUFrequencyChart extends TimelineChart {
        public static final String CHART_TITLE = TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE;
        public static final String SERIES_NAME_FREQUENCY = TimelineChartLabels.CPU_FREQUENCY_CHART_FREQUENCY;
        
-       public static final Color COLOR_FREQ = TempConstants.LINE_COLOR_VIOLET;
-
        private static XYPlot xyPlot;
        private static double chartMaxVal = 0;
        private static boolean needUpdateChartRange = false;
@@ -64,7 +64,7 @@ public class CPUFrequencyChart extends TimelineChart {
        
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
-               seriesColorList.add(COLOR_FREQ);
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPU_FREQ));
                
                return seriesColorList;
        }
@@ -185,18 +185,18 @@ public class CPUFrequencyChart extends TimelineChart {
                List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
 
                /* app load */
-               SeriesDataSet dataSet_freq1 = new SeriesDataSet();
-               dataSet_freq1.setSeriesName(SERIES_NAME_FREQUENCY);
-               dataSet_freq1.setBaseSeries(new TimeSeries(SERIES_NAME_FREQUENCY));
-               dataSet_freq1.setNewSeries(new TimeSeries(SERIES_NAME_FREQUENCY));
-               seriesDataSetList.add(dataSet_freq1);
+               SeriesDataSet dataSet_freq = new SeriesDataSet();
+               dataSet_freq.setSeriesName(SERIES_NAME_FREQUENCY);
+               dataSet_freq.setBaseSeries(new TimeSeries(SERIES_NAME_FREQUENCY));
+               dataSet_freq.setNewSeries(new TimeSeries(SERIES_NAME_FREQUENCY));
+               seriesDataSetList.add(dataSet_freq);
 
                return seriesDataSetList;
        }
        
        private void setSeriesRendering() {
                XYLineAndShapeRenderer lineRenderer = new XYLineAndShapeRenderer(true, false);
-               lineRenderer.setSeriesPaint(0, COLOR_FREQ);
+               lineRenderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPU_FREQ));
                xyPlot.setRenderer(0, lineRenderer);
        }
        

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DeviceChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DeviceChart.java
index ad60e5e..c1da098 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DeviceChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DeviceChart.java
@@ -39,8 +39,8 @@ public class DeviceChart extends TimelineChart {
        
        public static final Color COLOR_ENABLED = Color.WHITE;
        public static final Color COLOR_CONNECTED = Color.GREEN;
-       public static final Color COLOR_CALL_VOICE = TempConstants.LINE_COLOR_GOLDENROD;
-       public static final Color COLOR_CALL_VIDEO = TempConstants.LINE_COLOR_TURQUOISE;
+       public static final Color COLOR_CALL_VOICE = Color.RED;
+       public static final Color COLOR_CALL_VIDEO = Color.BLACK;
        
        private XYTextAnnotation wifiAnnotation = new XYTextAnnotation(TimelineChartLabels.DEVICE_CHART_WIFI, 0, TempConstants.WIFI_SET_VALUE);
        private XYTextAnnotation btAnnotation = new XYTextAnnotation(TimelineChartLabels.DEVICE_CHART_BLUETOOTH, 0, TempConstants.BT_SET_VALUE);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/FileChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/FileChart.java
index 2f6603d..ca0edc1 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/FileChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/FileChart.java
@@ -19,10 +19,11 @@ import org.jfree.data.time.TimeSeries;
 import org.jfree.data.xy.XYDataItem;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.experimental.swt.SWTUtils;
+import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
-import org.tizen.dynamicanalyzer.timeline.TempConstants;
 import org.tizen.dynamicanalyzer.utils.Formatter;
 
 public class FileChart extends TimelineChart {
@@ -31,10 +32,6 @@ public class FileChart extends TimelineChart {
        public static final String SERIES_NAME_WRITE = TimelineChartLabels.FILE_CHART_SERIES_NAME_WRITE;
        public static final String SERIES_NAME_FDCOUNT = TimelineChartLabels.FILE_CHART_SERIES_NAME_FD_COUNT;
 
-       public static final Color COLOR_READ = TempConstants.LINE_COLOR_GOLDENROD;
-       public static final Color COLOR_WIRTE = TempConstants.LINE_COLOR_TURQUOISE;
-       public static final Color COLOR_FD_COUNT = TempConstants.LINE_COLOR_VIOLET;
-
        private static final int MIN_FDCOUNT = 5;
        public static int maxFDCount = MIN_FDCOUNT;
 
@@ -92,9 +89,9 @@ public class FileChart extends TimelineChart {
        
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
-               seriesColorList.add(COLOR_READ);
-               seriesColorList.add(COLOR_WIRTE);
-               seriesColorList.add(COLOR_FD_COUNT);
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_FILE_READ));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_FILE_WRITE));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_FILE_FD));
                
                return seriesColorList;
        }
@@ -137,7 +134,7 @@ public class FileChart extends TimelineChart {
                }
 
                XYLineAndShapeRenderer lineRenderer = new XYLineAndShapeRenderer();
-               lineRenderer.setSeriesPaint(0, COLOR_FD_COUNT);
+               lineRenderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_FILE_FD));
                lineRenderer.setSeriesShapesVisible(0, false);
                xyplot.setRenderer(0, lineRenderer);
                
@@ -145,8 +142,8 @@ public class FileChart extends TimelineChart {
                barRenderer.setBarPainter(new StandardXYBarPainter());
                barRenderer.setShadowVisible(false);
                barRenderer.setDrawBarOutline(false);
-               barRenderer.setSeriesPaint(0, COLOR_READ);
-               barRenderer.setSeriesPaint(1, COLOR_WIRTE);
+               barRenderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_FILE_READ));
+               barRenderer.setSeriesPaint(1, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_FILE_WRITE));
                xyplot.setRenderer(1, barRenderer);
        }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/HeapChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/HeapChart.java
index bbbbcee..ebca11d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/HeapChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/HeapChart.java
@@ -17,6 +17,8 @@ import org.jfree.data.time.TimeSeries;
 import org.jfree.data.xy.XYDataItem;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.experimental.swt.SWTUtils;
+import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.Logs;
@@ -30,9 +32,6 @@ public class HeapChart extends TimelineChart {
        public static final String SERIES_NAME_TOTAL_ALLOCATION = TimelineChartLabels.HEAP_CHART_SERIES_NAME_TOTAL_ALLOCATION;
        public static final String SERIES_NAME_USER_ALLOCATION = TimelineChartLabels.HEAP_CHART_SERIES_NAME_USER_ALLOCATION;
 
-       public static final Color COLOR_TOTAL_ALLOCATION = TempConstants.LINE_COLOR_GOLDENROD;
-       public static final Color COLOR_USER_ALLOCATION = TempConstants.LINE_COLOR_TURQUOISE;
-
        public static final String NIL = TimelineChartLabels.HEAP_CHART_NIL;
        
        public static int sizeMode = TimelineConstants.ITEM_SIZE_MODE_DEF;
@@ -86,8 +85,8 @@ public class HeapChart extends TimelineChart {
        
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
-               seriesColorList.add(COLOR_TOTAL_ALLOCATION);
-               seriesColorList.add(COLOR_USER_ALLOCATION);
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_HEAP_SYSTEM));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_HEAP_USER));
                
                return seriesColorList;
        }
@@ -324,8 +323,8 @@ public class HeapChart extends TimelineChart {
 
        private void setSeriesRendering() {
                XYAreaRenderer renderer = (XYAreaRenderer)xyPlot.getRenderer();
-               renderer.setSeriesPaint(0, COLOR_USER_ALLOCATION);
-               renderer.setSeriesPaint(1, COLOR_TOTAL_ALLOCATION);
+               renderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_HEAP_USER));
+               renderer.setSeriesPaint(1, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_HEAP_SYSTEM));
        }
 
        @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java
index a86ba34..bd881d7 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java
@@ -16,6 +16,8 @@ import org.jfree.data.time.TimeSeries;
 import org.jfree.data.xy.XYDataItem;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.experimental.swt.SWTUtils;
+import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
@@ -29,10 +31,6 @@ public class ProcessMemoryChart extends TimelineChart {
        public static final String SERIES_NAME_RSS = TimelineChartLabels.PROCESS_MEMORY_CHART_RSS;
        public static final String SERIES_NAME_PSS = TimelineChartLabels.PROCESS_MEMORY_CHART_PSS;
 
-       public static final Color COLOR_VSS = TempConstants.LINE_COLOR_GOLDENROD;
-       public static final Color COLOR_RSS = TempConstants.LINE_COLOR_TURQUOISE;
-       public static final Color COLOR_PSS = TempConstants.LINE_COLOR_VIOLET;
-
        public static int sizeMode = TimelineConstants.ITEM_SIZE_MODE_DEF;
 
        private static XYPlot xyPlot;
@@ -92,9 +90,9 @@ public class ProcessMemoryChart extends TimelineChart {
        
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
-               seriesColorList.add(COLOR_VSS);
-               seriesColorList.add(COLOR_RSS);
-               seriesColorList.add(COLOR_PSS);
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_PROCESS_VSS));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_PROCESS_RSS));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_PROCESS_PSS));
                
                return seriesColorList;
        }
@@ -187,9 +185,9 @@ public class ProcessMemoryChart extends TimelineChart {
 
        private void setSeriesRendering() {
                XYAreaRenderer renderer = (XYAreaRenderer)xyPlot.getRenderer();
-               renderer.setSeriesPaint(0, COLOR_PSS);
-               renderer.setSeriesPaint(1, COLOR_RSS);
-               renderer.setSeriesPaint(2, COLOR_VSS);
+               renderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_PROCESS_PSS));
+               renderer.setSeriesPaint(1, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_PROCESS_RSS));
+               renderer.setSeriesPaint(2, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_PROCESS_VSS));
        }
 
        private XYSeriesCollection createDataset() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SnapShotChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SnapShotChart.java
index 64a82c0..0034cbd 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SnapShotChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SnapShotChart.java
@@ -29,7 +29,7 @@ public class SnapShotChart extends TimelineChart {
        public static final String SERIES_NAME_EVENT_UP_DOWN = TimelineChartLabels.SNAPSHOT_CHART_SERIES_NAME_EVENT_UP_DOWN;
        public static final String SERIES_NAME_EVENT_MOVE = TimelineChartLabels.SNAPSHOT_CHART_SERIES_NAME_EVENT_MOVE;
        
-       public static final Color COLOR_EVENT_UP_DOWN = TempConstants.AREA_COLOR_BLUE;
+       public static final Color COLOR_EVENT_UP_DOWN = Color.BLUE;
        public static final Color COLOR_EVENT_MOVE = Color.RED;
        
        private static final double SET_VALUE = 0.78;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SystemMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SystemMemoryChart.java
index 4a9bc98..d68ea33 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SystemMemoryChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SystemMemoryChart.java
@@ -16,6 +16,8 @@ import org.jfree.data.time.TimeSeries;
 import org.jfree.data.xy.XYDataItem;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.experimental.swt.SWTUtils;
+import org.tizen.dynamicanalyzer.ColorResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
@@ -29,10 +31,6 @@ public class SystemMemoryChart extends TimelineChart {
        public static final String SERIES_NAME_SYSTEM = TimelineChartLabels.SYSTEM_MEMORY_CHART_SERIES_NAME_SYSTEM;
        public static final String SERIES_NAME_TOTAL = TimelineChartLabels.SYSTEM_MEMORY_CHART_SERIES_NAME_TOTAL;
        
-       public static final Color COLOR_PROC_RESIDENT = TempConstants.AREA_COLOR_GREEN;
-       public static final Color COLOR_SYSTEM = TempConstants.AREA_COLOR_MAROON;
-       public static final Color COLOR_TOTAL = Color.GREEN;
-       
        public static int sizeMode = TimelineConstants.ITEM_SIZE_MODE_DEF;
 
        private static XYPlot xyPlot;
@@ -91,9 +89,9 @@ public class SystemMemoryChart extends TimelineChart {
        
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
-               seriesColorList.add(COLOR_TOTAL);
-               seriesColorList.add(COLOR_SYSTEM);
-               seriesColorList.add(COLOR_PROC_RESIDENT);
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_MEMORY_SYS_MAX));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_MEMORY_SYS_USED));
+               seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_MEMORY_APP_USED));
                
                return seriesColorList;
        }
@@ -194,9 +192,9 @@ public class SystemMemoryChart extends TimelineChart {
 
        private void setSeriesRendering() {
                XYAreaRenderer areaRenderer = (XYAreaRenderer) xyPlot.getRenderer();
-               areaRenderer.setSeriesPaint(0, COLOR_PROC_RESIDENT);
-               areaRenderer.setSeriesPaint(1, COLOR_SYSTEM);
-               areaRenderer.setSeriesPaint(2, COLOR_TOTAL);
+               areaRenderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_MEMORY_APP_USED));
+               areaRenderer.setSeriesPaint(1, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_MEMORY_SYS_USED));
+               areaRenderer.setSeriesPaint(2, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_MEMORY_SYS_MAX));
        }
 
        public static void parsingLogList(List<List<String>> logList) {