From b6e092e1bfa477a2899174ceda2b7edaeb444f6b Mon Sep 17 00:00:00 2001 From: heeyoung Date: Tue, 30 Sep 2014 19:50:38 +0900 Subject: [PATCH] Setting : modify setting information file resize widget for Windows delete previous config key Change-Id: I3a9c5b2a556abf68839aab04f76786347486d125 Signed-off-by: heeyoung --- .../toggle/DACustomToggleButtonRenderer.java | 2 +- .../dynamic-analyzer/config/feature | 127 +++++++++++++++++---- .../dynamic-analyzer/config/setting | 17 ++- .../dynamic-analyzer/config/template | 34 ++++-- .../ui/toolbar/setting/FeatureDialog.java | 2 +- ...atureDialogFeaturesTreeTableToggleRenderer.java | 27 +++-- .../ui/toolbar/setting/SettingDataManager.java | 28 ++--- .../ui/toolbar/setting/SettingDialog.java | 61 ++++++---- .../ui/toolbar/setting/SettingDialogManager.java | 15 ++- .../toolbar/setting/SettingDialogTemplatePage.java | 4 +- .../dynamicanalyzer/utils/InternalLogManager.java | 2 +- 11 files changed, 232 insertions(+), 87 deletions(-) diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java index 1dfca7f..7aba0da 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/button/toggle/DACustomToggleButtonRenderer.java @@ -180,7 +180,7 @@ public class DACustomToggleButtonRenderer extends DACustomButtonRenderer { if (attr.getAlign() == SWT.CENTER) { x = (textRect.width - p.x) / 2 + textRect.x; x = (x < 0) ? 0 : x; - offset = -2; +// offset = -2; } else { x = textRect.x; offset = 2; diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/feature b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/feature index 6bddc69..2e26ba9 100644 --- a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/feature +++ b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/feature @@ -1,22 +1,105 @@ -mobile-2.3|System|0||Description : System||||||| -mobile-2.3|System information sampling periodic|2|System|Description : System information sampling periodic|||100|1000|1000|| -mobile-2.3|System CPU|1|System|Description : System CPU|Timeline|CPU-CPU core-CPU frequency||||336|1 -mobile-2.3|System memory|1|System|Description : System memory|Timeline|Process Size-Memory-Heap allocation||||96|1 -mobile-2.3|System processes|1|System|Description : System processes|Timeline|CPU||||336|1 -mobile-2.3|System disk|1|System|Description : System disk|Timeline|Disk IO||||512|1 -mobile-2.3|System network|1|System|Description : System network|Timeline|Network IO||||1024|1 -mobile-2.3|System device|1|System|Description : System device|Timeline|Device||||2048|1 -mobile-2.3|System energy|1|System|Description : System energy|Timeline|Energy||||4096|1 -mobile-2.3|Function profiling|0||Description : Function Profiling|Timeline-Summary|||||4|1 -mobile-2.3|Function sampling|0||Description : Function sampling|Summary|||||524288|1 -mobile-2.3|Function profiling sampling periodic|2|Function sampling|Description : Function profiling sampling periodic|||1|1000|10|| -mobile-2.3|Memory allocation|0||Description : Memory allocation|Timeline-Summary|Heap allocation||||8|1 -mobile-2.3|File analysis|0||Description : File analysis|File|||||16|1 -mobile-2.3|Thread analysis|0||Description : Thread analysis|Thread|||||32|1 -mobile-2.3|Network analysis|0||Description : Network analysis|Network|||||131072|1 -mobile-2.3|OpenGL ES analysis|0||Description : OpenGL ES analysis|OpenGL|||||262144|1 -mobile-2.3|Screenshot|0||Description : Screenshot|Timeline|Screenshot||||128|1 -mobile-2.3|On scene transition|2|Screenshot|Description : On scene transition|||||1|| -mobile-2.3|periodically|2|Screenshot|Description : periodically|||1|100|10|| -mobile-2.3|UI event|0||Description : UI event|Timeline|UI event||||256|1 -mobile-2.3|Recording|0||Description : Recording||||||512|1 \ No newline at end of file +mobile-2.3|System|0||Description : System|||||||| +mobile-2.3|System information sampling periodic|2|System|Description : System information sampling periodic|||100|1000|1000||| +mobile-2.3|System memory|1|System|Description : System memory|Timeline|Process Size-Memory-Heap allocation|||||32|1 +mobile-2.3|System processes|1|System|Description : System processes|Timeline|CPU|||||256|1 +mobile-2.3|System disk|1|System|Description : System disk|Timeline|Disk IO|||||512|1 +mobile-2.3|System network|1|System|Description : System network|Timeline|Network IO|||||1024|1 +mobile-2.3|System device|1|System|Description : System device|Timeline|Device|||||2048|1 +mobile-2.3|System energy|1|System|Description : System energy|Timeline|Energy|||||4096|1 +mobile-2.3|Function profiling|0||Description : Function Profiling|Timeline-Summary|||||4||1 +mobile-2.3|Function sampling|0||Description : Function sampling|Summary|||||524288||1 +mobile-2.3|Function profiling sampling periodic|2|Function sampling|Description : Function profiling sampling periodic|||1|1000|10||| +mobile-2.3|Memory allocation|0||Description : Memory allocation|Timeline-Summary|Heap allocation||||8||1 +mobile-2.3|File analysis|0||Description : File analysis|File|||||1040||1 +mobile-2.3|Thread analysis|0||Description : Thread analysis|Thread|||||32|128|1 +mobile-2.3|Network analysis|0||Description : Network analysis|Network|||||131072||1 +mobile-2.3|OpenGL ES analysis|0||Description : OpenGL ES analysis|OpenGL|||||262144||1 +mobile-2.3|Screenshot|0||Description : Screenshot|Timeline|Screenshot||||128||1 +mobile-2.3|On scene transition|2|Screenshot|Description : On scene transition|||||1||| +mobile-2.3|periodically|2|Screenshot|Description : periodically|||1|100|10||| +mobile-2.3|UI event|0||Description : UI event|Timeline|UI event||||256||1 +mobile-2.3|Recording|0||Description : Recording||||||512||1 +mobile-2.3|Context switch|0||Description : Context switch|Kernel|||||65536||1 +mobile-2.3|System call|0||Description : System call|||||||| +mobile-2.3|System call file|1|System call|Description : System call file|Timeline|||||1024||1 +mobile-2.3|System call ipc|1|System call|Description : System call ipc|Timeline|||||2048||1 +mobile-2.3|System call process|1|System call|Description : System call process|Timeline|||||4096||1 +mobile-2.3|System call signal|1|System call|Description : System call signal|Timeline|||||8192||1 +mobile-2.3|System call network|1|System call|Description : System call network|Timeline|||||16384||1 +mobile-2.3|System call desc|1|System call|Description : System call desc|Timeline|||||32768||1 +mobile-2.3|Inside the platform|0||Description : Inside the platform|||||||| +mobile-2.3|Inside the platform memory|1|Inside the platform|Description : Inside the platform memory|Timeline-Summary|Heap allocation||||268435456||1 +mobile-2.3|Inside the platform file|1|Inside the platform|Description : Inside the platform file|File|||||536870912||1 +mobile-2.3|Inside the platform thread|1|Inside the platform|Description : Inside the platform thread|Thread|||||1073741824||1 +mobile-2.3|Inside the platform network|1|Inside the platform|Description : Inside the platform network|Network||||||1|1 +mobile-2.3|Inside the platform openGL|1|Inside the platform|Description : Inside the platform openGL|OpenGL||||||2|1 +wearable-2.3|System|0||Description : System|||||||| +wearable-2.3|System information sampling periodic|2|System|Description : System information sampling periodic|||100|1000|1000||| +wearable-2.3|System memory|1|System|Description : System memory|Timeline|Process Size-Memory-Heap allocation|||||32|1 +wearable-2.3|System processes|1|System|Description : System processes|Timeline|CPU|||||256|1 +wearable-2.3|System disk|1|System|Description : System disk|Timeline|Disk IO|||||512|1 +wearable-2.3|System network|1|System|Description : System network|Timeline|Network IO|||||1024|1 +wearable-2.3|System device|1|System|Description : System device|Timeline|Device|||||2048|1 +wearable-2.3|System energy|1|System|Description : System energy|Timeline|Energy|||||4096|1 +wearable-2.3|Function profiling|0||Description : Function Profiling|Timeline-Summary|||||4||1 +wearable-2.3|Function sampling|0||Description : Function sampling|Summary|||||524288||1 +wearable-2.3|Function profiling sampling periodic|2|Function sampling|Description : Function profiling sampling periodic|||1|1000|10||| +wearable-2.3|Memory allocation|0||Description : Memory allocation|Timeline-Summary|Heap allocation||||8||1 +wearable-2.3|File analysis|0||Description : File analysis|File|||||1040||1 +wearable-2.3|Thread analysis|0||Description : Thread analysis|Thread|||||32|128|1 +wearable-2.3|Network analysis|0||Description : Network analysis|Network|||||131072||1 +wearable-2.3|OpenGL ES analysis|0||Description : OpenGL ES analysis|OpenGL|||||262144||1 +wearable-2.3|Screenshot|0||Description : Screenshot|Timeline|Screenshot||||128||1 +wearable-2.3|On scene transition|2|Screenshot|Description : On scene transition|||||1||| +wearable-2.3|periodically|2|Screenshot|Description : periodically|||1|100|10||| +wearable-2.3|UI event|0||Description : UI event|Timeline|UI event||||256||1 +wearable-2.3|Recording|0||Description : Recording||||||512||1 +wearable-2.3|Context switch|0||Description : Context switch|Kernel|||||65536||1 +wearable-2.3|System call|0||Description : System call|||||||| +wearable-2.3|System call file|1|System call|Description : System call file|Timeline|||||1024||1 +wearable-2.3|System call ipc|1|System call|Description : System call ipc|Timeline|||||2048||1 +wearable-2.3|System call process|1|System call|Description : System call process|Timeline|||||4096||1 +wearable-2.3|System call signal|1|System call|Description : System call signal|Timeline|||||8192||1 +wearable-2.3|System call network|1|System call|Description : System call network|Timeline|||||16384||1 +wearable-2.3|System call desc|1|System call|Description : System call desc|Timeline|||||32768||1 +wearable-2.3|Inside the platform|0||Description : Inside the platform|||||||| +wearable-2.3|Inside the platform memory|1|Inside the platform|Description : Inside the platform memory|Timeline-Summary|Heap allocation||||268435456||1 +wearable-2.3|Inside the platform file|1|Inside the platform|Description : Inside the platform file|File|||||536870912||1 +wearable-2.3|Inside the platform thread|1|Inside the platform|Description : Inside the platform thread|Thread|||||1073741824||1 +wearable-2.3|Inside the platform network|1|Inside the platform|Description : Inside the platform network|Network||||||1|1 +wearable-2.3|Inside the platform openGL|1|Inside the platform|Description : Inside the platform openGL|OpenGL||||||2|1 +tv-0.1|System|0||Description : System|||||||| +tv-0.1|System information sampling periodic|2|System|Description : System information sampling periodic|||100|1000|1000||| +tv-0.1|System memory|1|System|Description : System memory|Timeline|Process Size-Memory-Heap allocation|||||32|1 +tv-0.1|System processes|1|System|Description : System processes|Timeline|CPU|||||256|1 +tv-0.1|System disk|1|System|Description : System disk|Timeline|Disk IO|||||512|1 +tv-0.1|System network|1|System|Description : System network|Timeline|Network IO|||||1024|1 +tv-0.1|System device|1|System|Description : System device|Timeline|Device|||||2048|1 +tv-0.1|System energy|1|System|Description : System energy|Timeline|Energy|||||4096|1 +tv-0.1|Function profiling|0||Description : Function Profiling|Timeline-Summary|||||4||1 +tv-0.1|Function sampling|0||Description : Function sampling|Summary|||||524288||1 +tv-0.1|Function profiling sampling periodic|2|Function sampling|Description : Function profiling sampling periodic|||1|1000|10||| +tv-0.1|Memory allocation|0||Description : Memory allocation|Timeline-Summary|Heap allocation||||8||1 +tv-0.1|File analysis|0||Description : File analysis|File|||||1040||1 +tv-0.1|Thread analysis|0||Description : Thread analysis|Thread|||||32|128|1 +tv-0.1|Network analysis|0||Description : Network analysis|Network|||||131072||1 +tv-0.1|OpenGL ES analysis|0||Description : OpenGL ES analysis|OpenGL|||||262144||1 +tv-0.1|Screenshot|0||Description : Screenshot|Timeline|Screenshot||||128||1 +tv-0.1|On scene transition|2|Screenshot|Description : On scene transition|||||1||| +tv-0.1|periodically|2|Screenshot|Description : periodically|||1|100|10||| +tv-0.1|UI event|0||Description : UI event|Timeline|UI event||||256||1 +tv-0.1|Recording|0||Description : Recording||||||512||1 +tv-0.1|Context switch|0||Description : Context switch|Kernel|||||65536||1 +tv-0.1|System call|0||Description : System call|||||||| +tv-0.1|System call file|1|System call|Description : System call file|Timeline|||||1024||1 +tv-0.1|System call ipc|1|System call|Description : System call ipc|Timeline|||||2048||1 +tv-0.1|System call process|1|System call|Description : System call process|Timeline|||||4096||1 +tv-0.1|System call signal|1|System call|Description : System call signal|Timeline|||||8192||1 +tv-0.1|System call network|1|System call|Description : System call network|Timeline|||||16384||1 +tv-0.1|System call desc|1|System call|Description : System call desc|Timeline|||||32768||1 +tv-0.1|Inside the platform|0||Description : Inside the platform|||||||| +tv-0.1|Inside the platform memory|1|Inside the platform|Description : Inside the platform memory|Timeline-Summary|Heap allocation||||268435456||1 +tv-0.1|Inside the platform file|1|Inside the platform|Description : Inside the platform file|File|||||536870912||1 +tv-0.1|Inside the platform thread|1|Inside the platform|Description : Inside the platform thread|Thread|||||1073741824||1 +tv-0.1|Inside the platform network|1|Inside the platform|Description : Inside the platform network|Network||||||1|1 +tv-0.1|Inside the platform openGL|1|Inside the platform|Description : Inside the platform openGL|OpenGL||||||2|1 diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/setting b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/setting index 7fc375d..7d7a71e 100644 --- a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/setting +++ b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/setting @@ -1,8 +1,17 @@ -Target List|mobile-2.3 +Version|0.1 +Target List|mobile-2.3|wearable-2.3|tv-0.1 Selected Target|mobile-2.3 -Selected Chart List|CPU frequency|CPU|CPU core +Selected Chart List|CPU|CPU core|CPU frequency Show Initial|false Auto Stop|false +Default Chart List|CPU|CPU core|CPU frequency +Default Swap Value|0|80 Selected Template|mobile-2.3|Bottleneck -Selected FeatureList|mobile-2.3|System|System CPU|System processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 -Available Chart List|mobile-2.3|CPU|CPU core|CPU frequency|Heap allocation|Process Size|Memory|Screenshot|UI event|Disk IO|Network IO|Device|Energy \ No newline at end of file +Selected FeatureList|mobile-2.3|System|System processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 +Available Chart List|mobile-2.3|CPU|CPU core|CPU frequency|Heap allocation|Process Size|Memory|Screenshot|UI event|Disk IO|Network IO|Device|Energy +Selected Template|wearable-2.3|Bottleneck +Selected FeatureList|wearable-2.3|System|System processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 +Available Chart List|wearable-2.3|CPU|CPU core|CPU frequency|Heap allocation|Process Size|Memory|Screenshot|UI event|Disk IO|Network IO|Device|Energy +Selected Template|tv-0.1|Bottleneck +Selected FeatureList|tv-0.1|System|System processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 +Available Chart List|tv-0.1|CPU|CPU core|CPU frequency|Heap allocation|Process Size|Memory|Screenshot|UI event|Disk IO|Network IO|Device|Energy diff --git a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/template b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/template index b8ac609..490d2ef 100644 --- a/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/template +++ b/org.tizen.dynamicanalyzer.workbench/dynamic-analyzer/config/template @@ -1,10 +1,30 @@ -mobile-2.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 +mobile-2.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 processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 mobile-2.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|Function profiling -mobile-2.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 +mobile-2.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 processes|System memory|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 mobile-2.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 -mobile-2.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 -mobile-2.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 +mobile-2.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 processes|System information sampling periodic:1000|Thread analysis +mobile-2.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 processes|System network|System disk|System information sampling periodic:1000|Thread analysis|Network analysis|File analysis mobile-2.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 -mobile-2.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|periodically:10|OpenGL ES analysis -mobile-2.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 -mobile-2.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. \ No newline at end of file +mobile-2.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 processes|System information sampling periodic:1000|Function profiling|Screenshot|periodically:10|OpenGL ES analysis +mobile-2.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 processes|System memory|System energy|System information sampling periodic:1000 +mobile-2.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. +wearable-2.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 processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 +wearable-2.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|Function profiling +wearable-2.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 processes|System memory|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 +wearable-2.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 +wearable-2.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 processes|System information sampling periodic:1000|Thread analysis +wearable-2.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 processes|System network|System disk|System information sampling periodic:1000|Thread analysis|Network analysis|File analysis +wearable-2.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 +wearable-2.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 processes|System information sampling periodic:1000|Function profiling|Screenshot|periodically:10|OpenGL ES analysis +wearable-2.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 processes|System memory|System energy|System information sampling periodic:1000 +wearable-2.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-0.1|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 processes|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 +tv-0.1|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|Function profiling +tv-0.1|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 processes|System memory|System information sampling periodic:1000|Function profiling|Function sampling|Function profiling sampling periodic:10 +tv-0.1|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-0.1|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 processes|System information sampling periodic:1000|Thread analysis +tv-0.1|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 processes|System network|System disk|System information sampling periodic:1000|Thread analysis|Network analysis|File analysis +tv-0.1|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-0.1|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 processes|System information sampling periodic:1000|Function profiling|Screenshot|periodically:10|OpenGL ES analysis +tv-0.1|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 processes|System memory|System energy|System information sampling periodic:1000 +tv-0.1|Custom|This template can be configured by selecting the desired features. If you change the feature in the other template will change custom template. diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java index 02c046f..6fde633 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialog.java @@ -165,7 +165,7 @@ public class FeatureDialog extends DAMessageBox { protected boolean run() { // shell.setSize(446, 424); - shell.setSize(580, 500); + shell.setSize(610, 520); shell.setLayout(new FormLayout()); shell.setText(ConfigureLabels.FEATURE_DIALOG_HEADER_TITLE); shell.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java index cdc4c7b..3add089 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FeatureDialogFeaturesTreeTableToggleRenderer.java @@ -221,7 +221,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender // text box systemTextBox = new DAText(detailSystemComposit, SWT.SINGLE); data = new FormData(); - data.top = new FormAttachment(0, 3); + data.top = new FormAttachment(0, 4); data.left = new FormAttachment(systemTitle, 5); data.width = 50; data.height = 13; @@ -249,7 +249,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender data = new FormData(); data.top = new FormAttachment(0, 5); data.left = new FormAttachment(systemTextBoxLabel, 5); - data.width = 235; + data.width = 250; data.height = 16; systemInfo.setLayoutData(data); systemInfo.setForeground(ColorResources.RED); @@ -278,7 +278,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender // text box samplingTextBox = new DAText(detailSamplingComposit, SWT.SINGLE); data = new FormData(); - data.top = new FormAttachment(0, 3); + data.top = new FormAttachment(0, 4); data.left = new FormAttachment(samplingTitle, 5); data.width = 50; data.height = 13; @@ -306,7 +306,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender data = new FormData(); data.top = new FormAttachment(0, 5); data.left = new FormAttachment(samplingTextBoxLabel, 5); - data.width = 220; + data.width = 250; data.height = 16; samplingInfo.setLayoutData(data); samplingInfo.setForeground(ColorResources.RED); @@ -325,7 +325,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender FormData data = new FormData(); data.top = new FormAttachment(0, 3); data.left = new FormAttachment(0, 0); - data.width = 130; + data.width = 135; data.height = 16; auto.setLayoutData(data); auto.setForeground(ColorResources.SETTING_COLOR); @@ -354,7 +354,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender // text box screenShotTextBox = new DAText(detailScreenShotComposit, SWT.SINGLE); data = new FormData(); - data.top = new FormAttachment(0, 3); + data.top = new FormAttachment(0, 4); data.left = new FormAttachment(period, 5); data.width = 50; data.height = 13; @@ -382,7 +382,7 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender data = new FormData(); data.top = new FormAttachment(0, 5); data.left = new FormAttachment(screenShotTextBoxLabel, 5); - data.width = 220; + data.width = 250; data.height = 16; screenShotInfo.setLayoutData(data); screenShotInfo.setForeground(ColorResources.RED); @@ -396,11 +396,14 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender if (text.equals(systemTextBox.getText()) == false) { systemTextBox.setText(text); } - + if (isTableSelectedFeature(item.getParentItem().getText()) == true) { systemTextBox.getControl().setEnabled(true); + checkValidInputText(ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE, + systemTextBox, systemInfo); } else { systemTextBox.getControl().setEnabled(false); + systemInfo.setText(CommonConstants.EMPTY); } systemEditor = new GridEditor(table); @@ -419,8 +422,11 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender if (isTableSelectedFeature(item.getParentItem().getText()) == true) { samplingTextBox.getControl().setEnabled(true); + checkValidInputText(ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_PROFILING_SAMPLING_RATE, + samplingTextBox, samplingInfo); } else { samplingTextBox.getControl().setEnabled(false); + samplingInfo.setText(CommonConstants.EMPTY); } if (AnalyzerManager.isRunning()) { @@ -452,15 +458,20 @@ public class FeatureDialogFeaturesTreeTableToggleRenderer extends AbstractRender // check radio button if (period.isSelected() == true) { screenShotTextBox.getControl().setEnabled(true); + checkValidInputText(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY, + screenShotTextBox, screenShotInfo); } else { screenShotTextBox.getControl().setEnabled(false); + screenShotInfo.setText(CommonConstants.EMPTY); } + // check parent feature if (isTableSelectedFeature(item.getParentItem().getText()) == true) { detailScreenShotComposit.setEnabled(true); } else { detailScreenShotComposit.setEnabled(false); screenShotTextBox.getControl().setEnabled(false); + screenShotInfo.setText(CommonConstants.EMPTY); } screenShotEditor = new GridEditor(table); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java index 8c542b1..b10b176 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDataManager.java @@ -96,10 +96,6 @@ public class SettingDataManager { // available target list private Map targetListMap = null; - // TODO : check additional property - private String platform = null; - private long internalLogLevel = 4; - private SettingDataManager() { parseSettingData(SETTING_FILE_NAME); parseSettingData(FEATUER_FILE_NAME); @@ -519,18 +515,6 @@ public class SettingDataManager { } } - public String getPlatform() { - if (null == platform || platform.isEmpty() || platform.equals(ConfigureLabels.PLATFORM_ETC)) { - return null; - } else { - return platform; - } - } - - public long getInternalLogLevel() { - return internalLogLevel; - } - public void writeSelectedChartList(List selectedChartList) { setSelectedChartList(selectedChartList); @@ -580,4 +564,16 @@ public class SettingDataManager { } return state; } + + + // TODO : another function is implemented, will be deleted. + public String getPlatform() { +// if (null == platform || platform.isEmpty() || platform.equals(ConfigureLabels.PLATFORM_ETC)) { +// return null; +// } else { +// return platform; +// } + return null; + } + } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java index 9744691..f4a1c12 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java @@ -48,6 +48,7 @@ import org.tizen.dynamicanalyzer.nl.WidgetLabels; import org.tizen.dynamicanalyzer.resources.ColorResources; import org.tizen.dynamicanalyzer.resources.FontResources; import org.tizen.dynamicanalyzer.shortcut.ShortCutManager; +import org.tizen.dynamicanalyzer.util.Logger; import org.tizen.dynamicanalyzer.widgets.button.DACustomButton; import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener; import org.tizen.dynamicanalyzer.widgets.da.base.DAButton; @@ -129,15 +130,15 @@ public class SettingDialog extends DAMessageBox { private void doApply() { Composite selectedComposite = tabView.getTopComposite(); if (!(selectedComposite instanceof SettingDialogBinarySettingsPage)) { + // write setting data + SettingDataManager.getInstance().applySettingData(); + if (DACommunicator.isRunning() == false) { // add & remove tab view page SettingDialogManager.getInstance().updateTabViewPage(); // add & remove (timeline) chart SettingDialogManager.getInstance().updateChartList(); - - // write setting data - SettingDataManager.getInstance().applySettingData(); } } else { // binary setting page @@ -148,19 +149,14 @@ public class SettingDialog extends DAMessageBox { } private void doRevert() { - Composite selectedComposite = tabView.getTopComposite(); - if (!(selectedComposite instanceof SettingDialogBinarySettingsPage)) { - if (DACommunicator.isRunning() == false) { - // rollback setting data - SettingDataManager.getInstance().revertSettingData(); + // rollback setting data + SettingDataManager.getInstance().revertSettingData(); // HIDDEN SETTING WIDGET (CHECKBOX, BUTTON) -// // update template view -// templatesPage.createTemplateTitleComposite(); -// templatesPage.createTemplateDescriptionComposite(); -// templatesPage.createTargetComposite(); - } - } +// // update template view +// templatesPage.createTemplateTitleComposite(); +// templatesPage.createTemplateDescriptionComposite(); +// templatesPage.createTargetComposite(); } private void doRun() { @@ -169,10 +165,6 @@ public class SettingDialog extends DAMessageBox { if (DACommunicator.isRunning() == false) { SettingDialogManager.getInstance().applySwapValue(); } - } else { - // binary setting page - SettingDialogBinarySettingsPage page = (SettingDialogBinarySettingsPage) selectedComposite; - page.doClose(); } } @@ -227,7 +219,6 @@ public class SettingDialog extends DAMessageBox { tabView.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR); tabView.setTabWidth(120); compData = new FormData(); - compData = new FormData(); compData.top = new FormAttachment(0, 0); compData.left = new FormAttachment(0, 0); compData.right = new FormAttachment(100, 0); @@ -302,6 +293,34 @@ public class SettingDialog extends DAMessageBox { // } // }); + // binarySettings tab is selected, the close button will be shown. + // ok and cancel button is hidden + binarySettings.addListener(SWT.Show, new Listener() { + + @Override + public void handleEvent(Event event) { + Logger.debug("binary settings show"); + cancelButton.setText(WidgetLabels.CLOSE); + FormData data = (FormData) okButton.getLayoutData(); + data.width = 0; + + buttonContentsComp.layout(); + } + }); + + binarySettings.addListener(SWT.Hide, new Listener() { + + @Override + public void handleEvent(Event event) { + Logger.debug("binary settings hide"); + cancelButton.setText(WidgetLabels.CANCEL); + FormData data = (FormData) okButton.getLayoutData(); + data.width = 100; + + buttonContentsComp.layout(); + } + }); + cancelButton = new DAButton(buttonContentsComp, SWT.NONE); cancelButton.addClickListener(cancelButtonListener); cancelButton.setText(WidgetLabels.CANCEL); @@ -401,7 +420,6 @@ public class SettingDialog extends DAMessageBox { @Override public void shellActivated(ShellEvent e) { // TODO Auto-generated method stub - } @Override @@ -422,19 +440,16 @@ public class SettingDialog extends DAMessageBox { @Override public void shellDeactivated(ShellEvent e) { // TODO Auto-generated method stub - } @Override public void shellDeiconified(ShellEvent e) { // TODO Auto-generated method stub - } @Override public void shellIconified(ShellEvent e) { // TODO Auto-generated method stub - } }; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java index 468b489..077063c 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogManager.java @@ -187,9 +187,20 @@ public class SettingDialogManager { public boolean validInputText(Grid table) { for (int i = 0; i < table.getItemCount(); i++) { + String featureName = table.getItem(i).getText(0); String optionText = table.getItem(i).getText(1); - if (optionText.contains(FeatureDialog.FEATURE_INVALID_VALUE)) { - return false; + + if ((optionText.contains(FeatureDialog.ITEM_ALL_CHECKED)) + || (optionText.contains(FeatureDialog.ITEM_PART_CHECKED))) { + + if (featureName.equals(ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION)) { + boolean value = (getOptionText(table.getItem(i), ConfigureLabels.AUTO).equals("1")? true : false); + if (value == false && optionText.contains(FeatureDialog.FEATURE_INVALID_VALUE)) { + return false; + } + } else if (optionText.contains(FeatureDialog.FEATURE_INVALID_VALUE)) { + return false; + } } } return true; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java index 4330a8c..2c819a2 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogTemplatePage.java @@ -319,7 +319,7 @@ public class SettingDialogTemplatePage extends DAPageComposite { Point imagePoint = new Point(18, 8); Point fontPoint = new Point(-1, 60); int topPosition = 4; - int leftPosition = 4; + int leftPosition = 3; for (Map.Entry entry : targetList.entrySet()) { TargetData target = entry.getValue(); @@ -592,7 +592,7 @@ public class SettingDialogTemplatePage extends DAPageComposite { leftPosition += 96; } else { leftPosition = 13; - topPosition += 80; + topPosition += 79; } // set selection template diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java index b642c0c..b6329e1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/InternalLogManager.java @@ -94,7 +94,7 @@ public class InternalLogManager { // TODO : check and remove // logLevel = ConfigureManager.getInstance().getValueLong( // ConfigureLabels.INTERNAL_LOG_LEVEL); - logLevel = SettingDataManager.getInstance().getInternalLogLevel(); +// logLevel = SettingDataManager.getInstance().getInternalLogLevel(); dateFormat = new SimpleDateFormat("yyyy:MM:dd:HH:mm:ss:SSS"); if (checkLevel(LOG_TYPE_FUNCTION)) { -- 2.7.4