[Title] Add new chart icon

[Desc.] Add Network ID, Disk IO, FPS, Frame rate, Frame time chart icons
[Issue]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ImageResources.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ImageResources.java
index 850d727..ba7d63e 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ImageResources.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/resources/ImageResources.java
@@ -244,6 +244,8 @@ public class ImageResources {
        public static final Image CHART_FILE = getPngImage("time_line_icon_read_write"); //$NON-NLS-1$\r
        public static final Image CHART_SCREENSHOT = getPngImage("time_line_icon_snapshot"); //$NON-NLS-1$\r
        public static final Image CHART_UI_EVENT = getPngImage("time_line_icon_UI_events"); //$NON-NLS-1$\r
+       public static final Image CHART_DISK_IO = getPngImage("time_line_icon_disk_io"); //$NON-NLS-1$\r
+       public static final Image CHART_NETWORK_IO = getPngImage("time_line_icon_network_io"); //$NON-NLS-1$\r
        public static final Image FD_USAGE = getPngImage("time_line_icon_fd_usage"); //$NON-NLS-1$\r
        public static final Image MEMORY = getPngImage("time_line_icon_memory"); //$NON-NLS-1$\r
        public static final Image ADD_ITEMS_NORMAL = getPngImage("add_chart_nor"); //$NON-NLS-1$\r
@@ -263,6 +265,11 @@ public class ImageResources {
        public static final Image UI_EVENT = getPngImage("time_line_icon_UI_events"); //$NON-NLS-1$\r
        public static final Image CHART_CUSTOM = getPngImage("time_line_icon_custom"); //$NON-NLS-1$\r
        public static final Image CHART_NETWORK = getPngImage("time_line_icon_traffic"); //$NON-NLS-1$\r
+       \r
+       /* graphics */\r
+       public static final Image CHART_FPS = getPngImage("time_line_icon_fps"); //$NON-NLS-1$\r
+       public static final Image CHART_FRAME_TIME= getPngImage("time_line_icon_frame_time"); //$NON-NLS-1$\r
+       public static final Image CHART_FRAME_RATE = getPngImage("time_line_icon_frame_rate"); //$NON-NLS-1$\r
 \r
        /* Resource */\r
        public static final Image TYPE_FILE = getPngImage("resource/resource_file"); //$NON-NLS-1$\r

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFPSChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFPSChart.java
index 29225a2..9237538 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFPSChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFPSChart.java
@@ -54,7 +54,7 @@ public class GLFPSChart extends TimelineChart {
 
        private GLFPSChart() {
                chartName = "FPS";
-               chartIcon = ImageResources.CHART_CPU;
+               chartIcon = ImageResources.CHART_FPS;
                fpsSeries = new DAChartSeries(chartName,
                                DAChartSeries.SERIES_STYLE_BAR,
                                ColorResources.SERIES_COLOR_CPU_APP);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameRateChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameRateChart.java
index fd13b78..2a35329 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameRateChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameRateChart.java
@@ -60,8 +60,8 @@ public class GLFrameRateChart extends TimelineChart {
        }
 
        private GLFrameRateChart() {
-               chartName = "Framerate";
-               chartIcon = ImageResources.CHART_CPU;
+               chartName = "Frame rate";
+               chartIcon = ImageResources.CHART_FRAME_RATE;
                framerateSeries = new DAChartSeries(chartName,
                                DAChartSeries.SERIES_STYLE_BAR,
                                ColorResources.SERIES_COLOR_CPU_APP);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameTimeChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameTimeChart.java
index 3b0ae41..b69bbbb 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameTimeChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/ui/chart/GLFrameTimeChart.java
@@ -53,7 +53,7 @@ public class GLFrameTimeChart extends TimelineChart {
 
        private GLFrameTimeChart() {
                chartName = "Frame time";
-               chartIcon = ImageResources.CHART_CPU;
+               chartIcon = ImageResources.CHART_FRAME_TIME;
                frameTimeSeries = new DAChartSeries(chartName,
                                DAChartSeries.SERIES_STYLE_BAR,
                                ColorResources.SERIES_COLOR_CPU_APP);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java
index 50cb3dc..c11f2de 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/DiskIOChart.java
@@ -66,8 +66,8 @@ public class DiskIOChart extends TimelineChart {
                chartType = TimelineConstants.CHART_TYPE_DISK_IO;
                probeType = DataChannelConstants.MSG_DATA_SYSTEM;
                chartName = TimelineChartLabels.DISK_IO_CHART_TITLE;
-               chartIcon = ImageResources.CHART_FILE;
-               addIcon = ImageResources.ADD_CHART_FILE;
+               chartIcon = ImageResources.CHART_DISK_IO;
+               addIcon = ImageResources.CHART_DISK_IO;
 
                readSeries = new DAChartSeries(
                                TimelineChartLabels.DISK_IO_CHART_SERIES_READ,

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java
index 5c9b7f4..c32fd13 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/NetworkIOChart.java
@@ -66,8 +66,8 @@ public class NetworkIOChart extends TimelineChart {
                chartType = TimelineConstants.CHART_TYPE_NETWORK_IO;
                probeType = DataChannelConstants.MSG_DATA_SYSTEM;
                chartName = TimelineChartLabels.NETWORK_IO_CHART_TITLE;
-               chartIcon = ImageResources.CHART_NETWORK;
-               addIcon = ImageResources.ADD_CHART_SOUND;
+               chartIcon = ImageResources.CHART_NETWORK_IO;
+               addIcon = ImageResources.CHART_NETWORK_IO;
 
                sendSeries = new DAChartSeries(
                                TimelineChartLabels.NETWORK_IO_CHART_SERIES_SEND,

diff --git a/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_disk_io.png b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_disk_io.png
new file mode 100755 (executable)
index 0000000..78702db
Binary files /dev/null and b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_disk_io.png differ

diff --git a/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_fps.png b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_fps.png
new file mode 100755 (executable)
index 0000000..4259ce0
Binary files /dev/null and b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_fps.png differ

diff --git a/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_frame_rate.png b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_frame_rate.png
new file mode 100755 (executable)
index 0000000..ddd37b8
Binary files /dev/null and b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_frame_rate.png differ

diff --git a/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_frame_time.png b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_frame_time.png
new file mode 100755 (executable)
index 0000000..916a2de
Binary files /dev/null and b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_frame_time.png differ

diff --git a/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_network_io.png b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_network_io.png
new file mode 100755 (executable)
index 0000000..2c72357
Binary files /dev/null and b/org.tizen.dynamicanalyzer/theme/white/img/time_line_icon_network_io.png differ