Setting : modify template description / fature table backgroud color 96/27496/1
authorheeyoung <heeyoung1008.hwang@samsung.com>
Mon, 15 Sep 2014 04:45:05 +0000 (13:45 +0900)
committerheeyoung <heeyoung1008.hwang@samsung.com>
Mon, 15 Sep 2014 04:45:05 +0000 (13:45 +0900)
Change-Id: Ic8c03a63ad30f1db4a50b512bde8e79413772921
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/setting.csv
org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/template.csv
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableCellRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java

index 37ca74a..66cde86 100755 (executable)
@@ -539,6 +539,8 @@ public class ColorResources {
        public static Color SETTING_TABLE_CONTENTS_NORMAL_EVEN = getColor("setting_table_contents_normal_even"); //$NON-NLS-1$\r
        public static Color SETTING_TABLE_CONTENTS_HOVER = getColor("setting_table_contents_hover"); //$NON-NLS-1$\r
        public static Color SETTING_TABLE_CONTENTS_SELECTED = getColor("setting_table_contents_selected"); //$NON-NLS-1$\r
+       public static Color SETTING_TABLE_CONTENTS_PARENT = getColor("setting_table_contents_parent"); //$NON-NLS-1$\r
+       public static Color SETTING_TABLE_CONTENTS_CHILD = getColor("setting_table_contents_child"); //$NON-NLS-1$\r
        public static Color SETTING_TABLE_HEADER_FONT_COLOR = getColor("setting_table_title_font_color"); //$NON-NLS-1$\r
        public static Color SETTING_TABLE_CONTENTS_FONT_COLOR = getColor("setting_table_contents_font_color"); //$NON-NLS-1$\r
        /** setting table colors end **/\r
index 508693c..c7ac0e5 100644 (file)
@@ -547,6 +547,8 @@ public class DAThemeWhite extends DATheme {
                setColor("setting_table_contents_normal_even", new RGB(240, 240, 240)); //$NON-NLS-1$
                setColor("setting_table_contents_hover", new RGB(197, 231, 235)); //$NON-NLS-1$
                setColor("setting_table_contents_selected", new RGB(117, 223, 235)); //$NON-NLS-1$
+               setColor("setting_table_contents_parent", new RGB(240, 242, 245)); //$NON-NLS-1$
+               setColor("setting_table_contents_child", new RGB(255, 255, 255)); //$NON-NLS-1$
                setColor("setting_table_contents_selected_font_color", new RGB(80, 80, 80)); //$NON-NLS-1$
                setColor("setting_table_title_font_color", new RGB(0, 0, 0)); //$NON-NLS-1$
                setColor("setting_table_contents_font_color", new RGB(80, 80, 80)); //$NON-NLS-1$
index 8087fe0..ee7dcea 100644 (file)
@@ -1,6 +1,6 @@
 Target List|mobile2.3|tv
 Selected Target|mobile2.3
-Selected Chart List|CPU|CPU core|CPU frequency|Heap allocation|Process Size|Memory|Screenshot|Disk IO|Network IO|Energy
+Selected Chart List|CPU frequency|CPU|CPU core
 Show Initial|false
 Auto Stop|false
 Selected Template|mobile2.3|Bottleneck
index 78a07a4..c66b67b 100644 (file)
@@ -1,20 +1,20 @@
-mobile2.3|Bottleneck|Description : Bottleneck|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10
-mobile2.3|Memory Leaks|Description : Memory Leaks|Memory allocation|System|System memory|System information sampling periodic:1000
-mobile2.3|Process Activity|Description : Process Activity|System|System CPU|System processes|System memory|System information sampling periodic:1000|Function sampling|Function profiling sampling periodic:10
-mobile2.3|File|Description : File|System|System disk|System information sampling periodic:1000|File analysis
-mobile2.3|Thread Activity|Thread template measures cpu usage of threads, visualizes life-cycle of each thread and relationship between threads. It also analyzes critical section duration and waiting time of synchronization objects.|System|System CPU|System processes|System information sampling periodic:1000|Thread analysis
-mobile2.3|Wait Status|Description : Wait Status|System|System CPU|System processes|System network|System disk|System information sampling periodic:1000|Thread analysis|Network analysis|File analysis
-mobile2.3|Network|Description : Network|System|System network|System information sampling periodic:1000|Network analysis
-mobile2.3|OpenGL|Description : OpenGL|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Screenshot|Auto Snapshot:1|OpenGL ES analysis
-mobile2.3|Energy|Description : Energy|System|System CPU|System processes|System memory|System energy|System information sampling periodic:1000
-mobile2.3|Custom|Description : Custom
-tv|Bottleneck|Description : Bottleneck|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10
-tv|Memory Leaks|Description : Memory Leaks|Memory allocation|System|System memory|System information sampling periodic:1000
-tv|Process Activity|Description : Process Activity|System|System CPU|System processes|System memory|System information sampling periodic:1000|Function sampling|Function profiling sampling periodic:10
-tv|File|Description : File|System|System disk|System information sampling periodic:1000|File analysis
-tv|Thread Activity|Thread template measures cpu usage of threads, visualizes life-cycle of each thread and relationship between threads. It also analyzes critical section duration and waiting time of synchronization objects.|System|System CPU|System processes|System information sampling periodic:1000|Thread analysis
-tv|Wait Status|Description : Wait Status|System|System CPU|System processes|System network|System disk|System information sampling periodic:1000|Thread analysis|Network analysis|File analysis
-tv|Network|Description : Network|System|System network|System information sampling periodic:1000|Network analysis
-tv|OpenGL|Description : OpenGL|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Screenshot|Auto Snapshot:1|OpenGL ES analysis
-tv|Energy|Description : Energy|System|System CPU|System processes|System memory|System energy|System information sampling periodic:1000
-tv|Custom|Description : Custom
+mobile2.3|Bottleneck|This template shows where can be the most bottleneck point while you are using your program. With the CPU and process chart, you can easily find where the application uses the CPU a lot. And the function profiling and call trace information shows the bottleneck point with the view of function level.|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10
+mobile2.3|Memory Leaks|This template shows the memory leak detected by this tool. Normally, the leak list in the Summary shows the allocation list that is not yet freed. And with the range feature in the timeline chart, you can also check the leak candidates which are not freed in an appropriate position.|Memory allocation|System|System memory|System information sampling periodic:1000
+mobile2.3|Process Activity|This template shows the overall activities of your concerning processes, which are process¡¯s CPU load and memory usage. And the function profiling is shown to help you to understand the detail activity of the process.|System|System CPU|System processes|System memory|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10
+mobile2.3|File|This template shows the operations(open, close, read, write and lock) of the files that were accessed by your application. It helps you to easily check the concurrent read/write access and the file lock waiting status of the processes for each file.|System|System disk|System information sampling periodic:1000|File analysis
+mobile2.3|Thread Activity|This template measures CPU usage of threads, visualizes life-cycle of each thread and relationship between threads. It also analyzes critical section duration and waiting time of synchronization objects.|System|System CPU|System processes|System information sampling periodic:1000|Thread analysis
+mobile2.3|Wait Status|This template shows various information that cause the process become wait status. With the CPU and process chart, you can distinguish the process is in busy status or wait status. If the process is waiting for the IO operation or lock, you can check it in the Network, File, and Thread analysis pages. |System|System CPU|System processes|System network|System disk|System information sampling periodic:1000|Thread analysis|Network analysis|File analysis
+mobile2.3|Network|This template shows the TCP/UDP network activity of the glibc socket. The Network chart shows each session information. And you can check which API has been called in each session and can see the transmitted data, too.|System|System network|System information sampling periodic:1000|Network analysis
+mobile2.3|OpenGL|This template shows a lot of detailed information of the openGL layer. It shows the FPS, render state, openGL calls, statistics and redundant usage of the API. These help you to optimize the performance of your application. We are supporting OpenGL ES 2.0 and EvasGL, now.|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Screenshot|Auto Snapshot:1|OpenGL ES analysis
+mobile2.3|Energy|This template inform you of power consumption of target device. you can see this information from Energy chart in Timeline page. Energy chart shows usage of Flash memory, CPU, LCD.|System|System CPU|System processes|System memory|System energy|System information sampling periodic:1000
+mobile2.3|Custom|This template can be configured by selecting the desired features. If you change the feature in the other template will change custom template.
+tv|Bottleneck|This template shows where can be the most bottleneck point while you are using your program. With the CPU and process chart, you can easily find where the application uses the CPU a lot. And the function profiling and call trace information shows the bottleneck point with the view of function level.|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10
+tv|Memory Leaks|This template shows the memory leak detected by this tool. Normally, the leak list in the Summary shows the allocation list that is not yet freed. And with the range feature in the timeline chart, you can also check the leak candidates which are not freed in an appropriate position.|Memory allocation|System|System memory|System information sampling periodic:1000
+tv|Process Activity|This template shows the overall activities of your concerning processes, which are process¡¯s CPU load and memory usage. And the function profiling is shown to help you to understand the detail activity of the process.|System|System CPU|System processes|System memory|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10
+tv|File|This template shows the operations(open, close, read, write and lock) of the files that were accessed by your application. It helps you to easily check the concurrent read/write access and the file lock waiting status of the processes for each file.|System|System disk|System information sampling periodic:1000|File analysis
+tv|Thread Activity|This template measures CPU usage of threads, visualizes life-cycle of each thread and relationship between threads. It also analyzes critical section duration and waiting time of synchronization objects.|System|System CPU|System processes|System information sampling periodic:1000|Thread analysis
+tv|Wait Status|This template shows various information that cause the process become wait status. With the CPU and process chart, you can distinguish the process is in busy status or wait status. If the process is waiting for the IO operation or lock, you can check it in the Network, File, and Thread analysis pages. |System|System CPU|System processes|System network|System disk|System information sampling periodic:1000|Thread analysis|Network analysis|File analysis
+tv|Network|This template shows the TCP/UDP network activity of the glibc socket. The Network chart shows each session information. And you can check which API has been called in each session and can see the transmitted data, too.|System|System network|System information sampling periodic:1000|Network analysis
+tv|OpenGL|This template shows a lot of detailed information of the openGL layer. It shows the FPS, render state, openGL calls, statistics and redundant usage of the API. These help you to optimize the performance of your application. We are supporting OpenGL ES 2.0 and EvasGL, now.|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Screenshot|Auto Snapshot:1|OpenGL ES analysis
+tv|Energy|This template inform you of power consumption of target device. you can see this information from Energy chart in Timeline page. Energy chart shows usage of Flash memory, CPU, LCD.|System|System CPU|System processes|System memory|System energy|System information sampling periodic:1000
+tv|Custom|This template can be configured by selecting the desired features. If you change the feature in the other template will change custom template.
index 5cdb105..3aa02bb 100644 (file)
@@ -204,7 +204,7 @@ public class FeatureDialog extends DAMessageBox {
                
                // Table
                featuresTable = new FeatureDialogFeaturesTable(tableComp,
-                               SWT.BORDER | SWT.V_SCROLL | SWT.SINGLE);
+                               SWT.BORDER | SWT.V_SCROLL | SWT.SINGLE | SWT.NO_FOCUS);
                featuresTable.setTree(true);
                featuresTable.setItemHeightSize(22);
                featuresTable.setTableName(ConfigureLabels.FEATURE_TABLE_TITLE);
index dfb0772..d79cc40 100644 (file)
@@ -72,13 +72,14 @@ public class FeatureDialogFeaturesTreeTableCellRenderer extends DefaultCellRende
        private void paintBackground(GC gc, GridItem item) {
                // background color
                Color color = null;
-               if (getRow() % 2 == 0) {
-                       color = ColorResources.SETTING_TABLE_CONTENTS_NORMAL_EVEN;
+               
+               if (item.getLevel() == 0) {
+                       color = ColorResources.SETTING_TABLE_CONTENTS_PARENT;
                } else {
-                       color = ColorResources.SETTING_TABLE_CONTENTS_NORMAL_ODD;
+                       color = ColorResources.SETTING_TABLE_CONTENTS_CHILD;
                }
                gc.setBackground(color);
-               gc.fillRectangle(getBounds().x, getBounds().y, getBounds().width, getBounds().height);
+               gc.fillRectangle(getBounds().x, getBounds().y, getBounds().width, getBounds().y + getBounds().height);
        
                // font color
                gc.setForeground(ColorResources.SETTING_TABLE_CONTENTS_FONT_COLOR);
index b19f3f5..0c4ec11 100644 (file)
@@ -204,6 +204,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                // composite
                detailSystemComposit = new Composite(table, SWT.NONE);
                detailSystemComposit.setLayout(new FormLayout());
+               detailSystemComposit.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
                
                // label
                systemTitle = new Label(detailSystemComposit, SWT.TRANSPARENT);
@@ -216,6 +217,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                systemTitle.setLayoutData(data);
                systemTitle.setForeground(ColorResources.SETTING_COLOR);
                systemTitle.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+               systemTitle.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
                
                // text box
                systemTextBox = new DAText(detailSystemComposit, SWT.SINGLE);
@@ -241,6 +243,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                systemTextBoxLabel.setLayoutData(data);
                systemTextBoxLabel.setForeground(ColorResources.SETTING_COLOR);
                systemTextBoxLabel.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+               systemTextBoxLabel.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
                
                // waring label
                systemInfo = new Label(detailSystemComposit, SWT.TRANSPARENT);
@@ -252,11 +255,13 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                systemInfo.setLayoutData(data);
                systemInfo.setForeground(ColorResources.RED);
                systemInfo.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+               systemInfo.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
        }
        
        private void initSamplingDetailWidget() {
                detailSamplingComposit = new Composite(table, SWT.NONE);
                detailSamplingComposit.setLayout(new FormLayout());
+               detailSamplingComposit.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
 
                // label
                samplingTitle = new Label(detailSamplingComposit, SWT.TRANSPARENT);
@@ -269,6 +274,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                samplingTitle.setLayoutData(data);
                samplingTitle.setForeground(ColorResources.SETTING_COLOR);
                samplingTitle.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+               samplingTitle.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
 
                // text box
                samplingTextBox = new DAText(detailSamplingComposit, SWT.SINGLE);
@@ -294,6 +300,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                samplingTextBoxLabel.setLayoutData(data);
                samplingTextBoxLabel.setForeground(ColorResources.SETTING_COLOR);
                samplingTextBoxLabel.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+               samplingTextBoxLabel.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
                
                // waring label
                samplingInfo = new Label(detailSamplingComposit, SWT.TRANSPARENT);
@@ -305,12 +312,14 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                samplingInfo.setLayoutData(data);
                samplingInfo.setForeground(ColorResources.RED);
                samplingInfo.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+               samplingInfo.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
 
        }
        
        private void initSnapshotDetailWidget() {
                detailScreenShotComposit = new Composite(table, SWT.NONE);
                detailScreenShotComposit.setLayout(new FormLayout());
+               detailScreenShotComposit.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
 
                radioGroup = new DARadioGroup();
                auto = new DARadioButton(detailScreenShotComposit, SWT.NONE);
@@ -326,6 +335,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                auto.setText(ConfigureLabels.SNAPSHOT_PERIODIC_AUTO);
                auto.addSelectionListener(autoScreenShotButtonListener);
                radioGroup.addChild(auto);
+               auto.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
 
                period = new DARadioButton(detailScreenShotComposit, SWT.NONE);
                data = new FormData();
@@ -340,6 +350,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                period.setText(ConfigureLabels.PERIODIC);
                period.addSelectionListener(periodScreenShotButtonListener);
                radioGroup.addChild(period);
+               period.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
 
                // text box
                screenShotTextBox = new DAText(detailScreenShotComposit, SWT.SINGLE);
@@ -365,6 +376,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                screenShotTextBoxLabel.setLayoutData(data);
                screenShotTextBoxLabel.setForeground(ColorResources.SETTING_COLOR);
                screenShotTextBoxLabel.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+               screenShotTextBoxLabel.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
                
                // waring label
                screenShotInfo = new Label(detailScreenShotComposit, SWT.TRANSPARENT);
@@ -376,6 +388,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender
                screenShotInfo.setLayoutData(data);
                screenShotInfo.setForeground(ColorResources.RED);
                screenShotInfo.setFont(FontResources.SETTING_DESCRIPTION_FONT);
+               screenShotInfo.setBackground(ColorResources.SETTING_TABLE_CONTENTS_CHILD);
        }
        
        private void updateSystemDetails(GridItem item) {       
index 842f0ec..4c8e890 100644 (file)
@@ -362,7 +362,7 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                        descriptionComp = new Composite(this, SWT.NONE);
                        descriptionComp.setLayout(new FormLayout());
                        FormData compData = new FormData();
-                       compData.top = new FormAttachment(0, 235);
+                       compData.top = new FormAttachment(0, 230);
                        compData.left = new FormAttachment(0, 98);
                        compData.width = 504;
                        compData.height = 159;  
@@ -392,15 +392,16 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                icon.setImage(templateHashMap.get(selectedTemplate));
                FormData data = new FormData();
                data.left = new FormAttachment(0, 21);
-               data.top = new FormAttachment(0, 21);
+               data.top = new FormAttachment(0, 16);
                data.width = 40;
                data.height = 40;
                icon.setLayoutData(data);
+               icon.setBackground(ColorResources.WHITE);
 
                // label : targetName
                targetNameLabel = new Label(descriptionComp, SWT.TRANSPARENT);
                data = new FormData();
-               data.top = new FormAttachment(0, 21);
+               data.top = new FormAttachment(0, 16);
                data.left = new FormAttachment(0, 81);
                data.width = 401;
                data.height = 15;       
@@ -413,10 +414,10 @@ public class SettingDialogTemplatePage extends DAPageComposite {
                // text : description
                targetDescriptionText = new Text(descriptionComp, SWT.MULTI | SWT.WRAP | SWT.READ_ONLY);
                data = new FormData();
-               data.top = new FormAttachment(0, 54);
+               data.top = new FormAttachment(0, 40);
                data.left = new FormAttachment(0, 81);
                data.width = 401;
-               data.height = 57;       
+               data.height = 70;       
                targetDescriptionText.setLayoutData(data);
                targetDescriptionText.setText(template.getDescription());
                targetDescriptionText.setBackground(ColorResources.WHITE);