From bee32b9b9a7a648ad02ccebace774a9e4118ec0e Mon Sep 17 00:00:00 2001 From: "joon.c.baek" Date: Wed, 4 May 2016 11:11:56 +0900 Subject: [PATCH] [SRADA-400] Reorder feature list and remove garbage Reorder feature list based on GUI asset list. And remove older feature list written by S-Core. Feature list will be changed later. Change-Id: I953e174a1d2fca1d14f95fd73638e149e85566bc Signed-off-by: joon.c.baek --- .../dynamicanalyzer/resources/ImageResources.java | 12 +- .../tizen/dynamicanalyzer/nl/ConfigureLabels.java | 8 + .../dynamicanalyzer/nl/ConfigureLabels.properties | 7 + .../tizen/dynamicanalyzer/setting/FlatFeature.java | 257 +++++++-------------- .../setting/FlatFeatureDialogFeatureListPage.java | 4 + 5 files changed, 117 insertions(+), 171 deletions(-) diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java index f21c2d9..03e7e48 100644 --- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java +++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java @@ -488,6 +488,9 @@ public class ImageResources { public static final Image FEATURE_FRAMERATE_FOCUS = getPngImage("feature_frame-rate_foc"); public static final Image FEATURE_FRAMERATE_NORMAL = getPngImage("feature_frame-rate_nor"); public static final Image FEATURE_FRAMERATE_SMALL = getPngImage("feature_frame-rate_s"); + public static final Image FEATURE_FRAMETIME_FOCUS = getPngImage("feature_frame-rate_foc"); + public static final Image FEATURE_FRAMETIME_NORMAL = getPngImage("feature_frame-rate_nor"); + public static final Image FEATURE_FRAMETIME_SMALL = getPngImage("feature_frame-rate_s"); public static final Image FEATURE_HEAPALLOC_FOCUS = getPngImage("feature_heap-allocation_foc"); public static final Image FEATURE_HEAPALLOC_NORMAL = getPngImage("feature_heap-allocation_nor"); public static final Image FEATURE_HEAPALLOC_SMALL = getPngImage("feature_heap-allocation_s"); @@ -518,15 +521,18 @@ public class ImageResources { public static final Image FEATURE_THREADACTIVITY_FOCUS = getPngImage("feature_thread-activity_foc"); public static final Image FEATURE_THREADACTIVITY_NORMAL = getPngImage("feature_thread-activity_nor"); public static final Image FEATURE_THREADACTIVITY_SMALL = getPngImage("feature_thread-activity_s"); - public static final Image FEATURE_TRAFFIC_FOCUS = getPngImage("feature_traffic_foc"); - public static final Image FEATURE_TRAFFIC_NORMAL = getPngImage("feature_traffic_nor"); - public static final Image FEATURE_TRAFFIC_SMALL = getPngImage("feature_traffic_s"); + public static final Image FEATURE_NETWORKTRAFFIC_FOCUS = getPngImage("feature_traffic_foc"); + public static final Image FEATURE_NETWORKTRAFFIC_NORMAL = getPngImage("feature_traffic_nor"); + public static final Image FEATURE_NETWORKTRAFFIC_SMALL = getPngImage("feature_traffic_s"); public static final Image FEATURE_UIEVENT_FOCUS = getPngImage("feature_UI-event_foc"); public static final Image FEATURE_UIEVENT_NORMAL = getPngImage("feature_UI-event_nor"); public static final Image FEATURE_UIEVENT_SMALL = getPngImage("feature_UI-event_s"); public static final Image FEATURE_VULKAN_FOCUS = getPngImage("feature_vulkan_foc"); public static final Image FEATURE_VULKAN_NORMAL = getPngImage("feature_vulkan_nor"); public static final Image FEATURE_VULKAN_SMALL = getPngImage("feature_vulkan_s"); + public static final Image FEATURE_UIHV_FOCUS = getPngImage("feature_template_hierarchyviewer"); //$NON-NLS-1$ + public static final Image FEATURE_UIHV_NORMAL = getPngImage("feature_template_hierarchyviewer"); //$NON-NLS-1$ + public static final Image FEATURE_UIHV_SMALL = getPngImage("feature_template_hierarchyviewer"); //$NON-NLS-1$ /*** stop progress dialog ***/ public static final Image STOP_PROGRESS_LOADING_01 = getPngImage("loading_icon_01"); //$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java index 1ac92c8..aeae472 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.java @@ -109,6 +109,7 @@ public class ConfigureLabels extends NLS { public static String FEATURE_NAME_SYSTEM_NETWORK; // 3.0 only public static String FEATURE_NAME_SYSTEM_DEVICE; // 3.0 only public static String FEATURE_NAME_SYSTEM_ENERGY; // 3.0 only + public static String FEATURE_NAME_SYSTEM_CURRENT; public static String FEATURE_NAME_FUNCTION_PROFILING; public static String FEATURE_NAME_FUNCTION_SAMPLING; // 3.0 only @@ -116,13 +117,20 @@ public class ConfigureLabels extends NLS { public static String FEATURE_NAME_APPLICATION_STARTUP; public static String FEATURE_NAME_FILE; + public static String FEATURE_NAME_READWRITE; public static String FEATURE_NAME_THREAD; public static String FEATURE_NAME_NETWORK; // 3.0 only + public static String FEATURE_NAME_NETWORKTRAFFIC; public static String FEATURE_NAME_OPENGL; // 3.0 only + public static String FEATURE_NAME_VULKAN; + public static String FEATURE_NAME_FRAMERATE; + public static String FEATURE_NAME_FRAMETIME; public static String FEATURE_NAME_USER_EVENT; public static String FEATURE_NAME_RECORDING; public static String FEATURE_NAME_CONTEXT_SWITCH; // 3.0 only public static String FEATURE_NAME_UI_HIERARCHY; + public static String FEATURE_NAME_SYNC; + public static String FEATURE_NAME_SYSTEM_CALL; // 3.0 only public static String FEATURE_NAME_SYSTEM_CALL_FILE; // 3.0 only diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties index 386f7bc..6eb7d8a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties @@ -76,6 +76,7 @@ FEATURE_NAME_SYSTEM_DISK=System disk FEATURE_NAME_SYSTEM_NETWORK=System network FEATURE_NAME_SYSTEM_DEVICE=System device FEATURE_NAME_SYSTEM_ENERGY=System energy +FEATURE_NAME_SYSTEM_CURRENT=System current FEATURE_NAME_FUNCTION_PROFILING=Function profiling FEATURE_NAME_FUNCTION_SAMPLING=Function sampling @@ -83,13 +84,19 @@ FEATURE_NAME_MEMORY_ALLOCATION=Memory allocation FEATURE_NAME_APPLICATION_STARTUP=Application startup profiling FEATURE_NAME_FILE=File analysis +FEATURE_NAME_READWRITE=File read/write FEATURE_NAME_THREAD=Thread analysis FEATURE_NAME_NETWORK=Network analysis +FEATURE_NAME_NETWORKTRAFFIC=Nework traffic FEATURE_NAME_OPENGL=OpenGL ES analysis +FEATURE_NAME_VULKAN=Vulkan +FEATURE_NAME_FRAMERATE=Frame rate +FEATURE_NAME_FRAMETIME=Frame time FEATURE_NAME_USER_EVENT=UI event FEATURE_NAME_RECORDING=Recording FEATURE_NAME_CONTEXT_SWITCH=Context switch FEATURE_NAME_UI_HIERARCHY=UI Hierarchy analysis +FEATURE_NAME_SYNC=Sync FEATURE_NAME_SYSTEM_CALL = System call FEATURE_NAME_SYSTEM_CALL_FILE=System call file diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/FlatFeature.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/FlatFeature.java index 04af349..70a02d7 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/FlatFeature.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/FlatFeature.java @@ -34,208 +34,129 @@ import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.resources.ImageResources; public enum FlatFeature { + // Group1 CPU SYSTEM(1, ConfigureLabels.FEATURE_NAME_SYSTEM, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - SYSTEM_CPU(2, ConfigureLabels.FEATURE_NAME_SYSTEM_CPU, + ImageResources.FEATURE_CPUCORE_FOCUS, + ImageResources.FEATURE_CPUCORE_NORMAL, + ImageResources.FEATURE_CPUCORE_SMALL), + SYSTEM_PROCESS(2, ConfigureLabels.FEATURE_NAME_SYSTEM_PROCESS, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_CPUCORE_FOCUS, + ImageResources.FEATURE_CPUCORE_NORMAL, + ImageResources.FEATURE_CPUCORE_SMALL), + SYSTEM_CPU(3, ConfigureLabels.FEATURE_NAME_SYSTEM_CPU, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, ImageResources.FEATURE_CPUFREQ_FOCUS, ImageResources.FEATURE_CPUFREQ_NORMAL, ImageResources.FEATURE_CPUFREQ_SMALL), - SYSTEM_PROCESS(3, ConfigureLabels.FEATURE_NAME_SYSTEM_PROCESS, + + // Group2 Process, Thread + THREAD_ANALYSIS(4, ConfigureLabels.FEATURE_NAME_THREAD, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPUCORE_FOCUS, - ImageResources.FEATURE_CPUCORE_NORMAL, - ImageResources.FEATURE_CPUCORE_SMALL), - SYSTEM_MEMORY(4, ConfigureLabels.FEATURE_NAME_SYSTEM_MEMORY, + ImageResources.FEATURE_THREADACTIVITY_FOCUS, + ImageResources.FEATURE_THREADACTIVITY_NORMAL, + ImageResources.FEATURE_THREADACTIVITY_SMALL), + SYNC_ANALYSIS(5, ConfigureLabels.FEATURE_NAME_SYNC, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_SYNC_FOCUS, + ImageResources.FEATURE_SYNC_NORMAL, + ImageResources.FEATURE_SYNC_SMALL), + FILE_ANALYSIS(6, ConfigureLabels.FEATURE_NAME_FILE, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_FILE_FOCUS, + ImageResources.FEATURE_FILE_NORMAL, + ImageResources.FEATURE_FILE_SMALL), + + // Group3 Memory + SYSTEM_MEMORY(7, ConfigureLabels.FEATURE_NAME_SYSTEM_MEMORY, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, ImageResources.FEATURE_MEM_SYSTEM_FOCUS, ImageResources.FEATURE_MEM_SYSTEM_NORMAL, ImageResources.FEATURE_MEM_SYSTEM_SMALL), - SYSTEM_ALL_PROCESSES(5, ConfigureLabels.FEATURE_NAME_SYSTEM_PROCESSES, + SYSTEM_ALL_PROCESSES(8, ConfigureLabels.FEATURE_NAME_SYSTEM_PROCESSES, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, ImageResources.FEATURE_MEM_PROCESS_FOCUS, ImageResources.FEATURE_MEM_PROCESS_NORMAL, ImageResources.FEATURE_MEM_PROCESS_SMALL), - SYSTEM_DISK(6, ConfigureLabels.FEATURE_NAME_SYSTEM_DISK, + MEMORY_ALLOCATION(9, ConfigureLabels.FEATURE_NAME_MEMORY_ALLOCATION, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_HEAPALLOC_FOCUS, + ImageResources.FEATURE_HEAPALLOC_NORMAL, + ImageResources.FEATURE_HEAPALLOC_SMALL), + + // Group4 Device + UI_EVENT_ANALYSIS(10, ConfigureLabels.FEATURE_NAME_USER_EVENT, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_UIEVENT_FOCUS, + ImageResources.FEATURE_UIEVENT_NORMAL, + ImageResources.FEATURE_UIEVENT_SMALL), + SYSTEM_DEVICE(11, ConfigureLabels.FEATURE_NAME_SYSTEM_DEVICE, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_DEVICE_FOCUS, + ImageResources.FEATURE_DEVICE_NORMAL, + ImageResources.FEATURE_DEVICE_SMALL), + SYSTEM_DISK(12, ConfigureLabels.FEATURE_NAME_SYSTEM_DISK, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, ImageResources.FEATURE_DISKIO_FOCUS, ImageResources.FEATURE_DISKIO_NORMAL, ImageResources.FEATURE_DISKIO_SMALL), - SYSTEM_NETWORK(7, ConfigureLabels.FEATURE_NAME_SYSTEM_NETWORK, + SYSTEM_NETWORK(13, ConfigureLabels.FEATURE_NAME_SYSTEM_NETWORK, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, ImageResources.FEATURE_NETWORKIO_FOCUS, ImageResources.FEATURE_NETWORKIO_NORMAL, ImageResources.FEATURE_NETWORKIO_SMALL), - SYSTEM_DEVICE(8, ConfigureLabels.FEATURE_NAME_SYSTEM_DEVICE, + SYSTEM_NETWORKTRAFFIC(14, ConfigureLabels.FEATURE_NAME_NETWORKTRAFFIC, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_DEVICE_FOCUS, - ImageResources.FEATURE_DEVICE_NORMAL, - ImageResources.FEATURE_DEVICE_SMALL), - SYSTEM_ENERGY(9, ConfigureLabels.FEATURE_NAME_SYSTEM_ENERGY, + ImageResources.FEATURE_NETWORKTRAFFIC_FOCUS, + ImageResources.FEATURE_NETWORKTRAFFIC_NORMAL, + ImageResources.FEATURE_NETWORKTRAFFIC_SMALL), + SYSTEM_READWRITE(15, ConfigureLabels.FEATURE_NAME_READWRITE, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_READWRITE_FOCUS, + ImageResources.FEATURE_READWRITE_NORMAL, + ImageResources.FEATURE_READWRITE_SMALL), + + // Group5 Energy + SYSTEM_ENERGY(16, ConfigureLabels.FEATURE_NAME_SYSTEM_ENERGY, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, ImageResources.FEATURE_ENERGY_FOCUS, ImageResources.FEATURE_ENERGY_NORMAL, ImageResources.FEATURE_ENERGY_SMALL), - - FUNCTION_PROFILING(100, ConfigureLabels.FEATURE_NAME_FUNCTION_PROFILING, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - FUNCTION_SAMPLING(101, ConfigureLabels.FEATURE_NAME_FUNCTION_SAMPLING, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - MEMORY_ALLOCATION(102, ConfigureLabels.FEATURE_NAME_MEMORY_ALLOCATION, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_HEAPALLOC_FOCUS, - ImageResources.FEATURE_HEAPALLOC_NORMAL, - ImageResources.FEATURE_HEAPALLOC_SMALL), - APPLICATION_STARTUP(103, ConfigureLabels.FEATURE_NAME_APPLICATION_STARTUP, + SYSTEM_CURRENT(17, ConfigureLabels.FEATURE_NAME_SYSTEM_CURRENT, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), + ImageResources.FEATURE_CURRENT_FOCUS, + ImageResources.FEATURE_CURRENT_NORMAL, + ImageResources.FEATURE_CURRENT_SMALL), - FILE_ANALYSIS(200, ConfigureLabels.FEATURE_NAME_FILE, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_FILE_FOCUS, - ImageResources.FEATURE_FILE_NORMAL, - ImageResources.FEATURE_FILE_SMALL), - THREAD_ANALYSIS(201, ConfigureLabels.FEATURE_NAME_THREAD, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_THREADACTIVITY_FOCUS, - ImageResources.FEATURE_THREADACTIVITY_NORMAL, - ImageResources.FEATURE_THREADACTIVITY_SMALL), - NETWORK_ANALYSIS(202, ConfigureLabels.FEATURE_NAME_NETWORK, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_NETWORKIO_FOCUS, - ImageResources.FEATURE_NETWORKIO_NORMAL, - ImageResources.FEATURE_NETWORKIO_SMALL), - OPENGL_ANALYSIS(203, ConfigureLabels.FEATURE_NAME_OPENGL, + // Group6 Graphic + OPENGL_ANALYSIS(18, ConfigureLabels.FEATURE_NAME_OPENGL, ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, ImageResources.FEATURE_OPENGL_FOCUS, ImageResources.FEATURE_OPENGL_NORMAL, ImageResources.FEATURE_OPENGL_SMALL), - UI_EVENT_ANALYSIS(204, ConfigureLabels.FEATURE_NAME_USER_EVENT, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_UIEVENT_FOCUS, - ImageResources.FEATURE_UIEVENT_NORMAL, - ImageResources.FEATURE_UIEVENT_SMALL), - CONTEXT_SWITCH_ANALYSIS(205, ConfigureLabels.FEATURE_NAME_CONTEXT_SWITCH, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - UI_HIERARCHY_ANALYSIS(206, ConfigureLabels.FEATURE_NAME_UI_HIERARCHY, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - - INTERNAL_PROBE(300, ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - INTERNAL_PROBE_MEMORY(301, ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_MEMORY, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - INTERNAL_PROBE_FILE(302, ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_FILE, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_FILE_FOCUS, - ImageResources.FEATURE_FILE_NORMAL, - ImageResources.FEATURE_FILE_SMALL), - INTERNAL_PROBE_THREAD(303, ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_THREAD, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - INTERNAL_PROBE_NETWORK(304, ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_NETWORK, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - INTERNAL_PROBE_OPENGL(305, ConfigureLabels.FEATURE_NAME_INSIDE_THE_PLATFORM_OPENGL, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - - SYSCALL(500, ConfigureLabels.FEATURE_NAME_SYSTEM_CALL, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - SYSCALL_FILE(501, ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_FILE, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - SYSCALL_IPC(502, ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_IPC, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - SYSCALL_PROCESS(503, ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_PROCESS, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - SYSCALL_SIGNAL(504, ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_SIGNAL, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - SYSCALL_NETWORK(505, ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_NETWORK, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - SYSCALL_DESC(506, ConfigureLabels.FEATURE_NAME_SYSTEM_CALL_DESC, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - - SYSTEM_SAMPLING_RATE(1000, ConfigureLabels.FEATURE_DETAIL_VALUE_SYSTEM_SAMPLING_RATE, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - FUNCTION_SAMPLING_RATE(1001, ConfigureLabels.FEATURE_DETAIL_VALUE_FUNCTION_SAMPLING_RATE, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - - SCREENSHOT_ON_SCENE_TRANSITION(5000, - ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_ON_SCENE_TRANSITION, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - SCREENSHOT_PERIODICALLY(5001, ConfigureLabels.FEATURE_DETAIL_VALUE_SCREENSHOT_PERIODICALLY, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_SNAPSHOT_FOCUS, - ImageResources.FEATURE_SNAPSHOT_NORMAL, - ImageResources.FEATURE_SNAPSHOT_SMALL), - RECORDING(5002, ConfigureLabels.FEATURE_NAME_RECORDING, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL), - AUTO_STOP(5003, ConfigureLabels.SETTING_OPTION_AUTO_STOP, - ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, - ImageResources.FEATURE_CPU_FOCUS, - ImageResources.FEATURE_CPU_NORMAL, - ImageResources.FEATURE_CPU_SMALL); + VULKAN_ANALYSIS(19, ConfigureLabels.FEATURE_NAME_VULKAN, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_VULKAN_FOCUS, + ImageResources.FEATURE_VULKAN_NORMAL, + ImageResources.FEATURE_VULKAN_SMALL), + FRAMERATE_ANALYSIS(20, ConfigureLabels.FEATURE_NAME_FRAMERATE, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_FRAMERATE_FOCUS, + ImageResources.FEATURE_FRAMERATE_NORMAL, + ImageResources.FEATURE_FRAMERATE_SMALL), + FRAMETIME_ANALYSIS(21, ConfigureLabels.FEATURE_NAME_FRAMETIME, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_FRAMETIME_FOCUS, + ImageResources.FEATURE_FRAMETIME_NORMAL, + ImageResources.FEATURE_FRAMETIME_SMALL), + + // Group7 UIHV + UI_HIERARCHY_ANALYSIS(22, ConfigureLabels.FEATURE_NAME_UI_HIERARCHY, + ConfigureLabels.FEATURE_DESCRIPTION_SYSTEM_CPU, + ImageResources.FEATURE_UIHV_FOCUS, + ImageResources.FEATURE_UIHV_NORMAL, + ImageResources.FEATURE_UIHV_SMALL); private static final Map featureByIndex = new HashMap(); private static final Map featureByName = new HashMap(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogFeatureListPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogFeatureListPage.java index d602c56..f944968 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogFeatureListPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/FlatFeatureDialogFeatureListPage.java @@ -214,6 +214,7 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { // listing available feature list TargetData target = SettingDataManager.INSTANCE.getTarget(null); List featureList = target.getAvailableFlatFeatureList(); + System.out.println(featureList); target.getSelectedFlatFeatureList(); featuretoggleGroup = new DACustomMultiToggleButtonGroup(); @@ -222,9 +223,12 @@ public class FlatFeatureDialogFeatureListPage extends DAPageComposite { int topPosition = 22; for (int i = 0 ; i < featureList.size(); i++) { + if (featureList.get(i) == null) + continue; FlatFeature feature = featureList.get(i); if (featuretoggleGroup.getGroupLength() < featureList.size()) { + System.out.println(feature.getName()); DACustomToggleButton toggle = createToggleButton(featureListInputComp, feature.getNormalImage(), feature.getFocusImage(), imagePoint, feature.getName(), -- 2.7.4