[Title]snapshot view & timeline char sync, show system cpu load

[Type]bug fixed
[Module]snapshot view
[Priority]high
[CQ#]
[Redmine#]5561
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/SnapshotView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/SnapshotView.java
index 3145e0f..90b489b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/SnapshotView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/SnapshotView.java
@@ -256,7 +256,10 @@ public class SnapshotView extends DAView {
        }
 
        private void computeData() {
-               String query = "select * from system where time = (select max(time) from system where time <= " //$NON-NLS-1$
+               
+               if(startTime % 1000000 != 0)
+                       startTime += 1000000;
+               String query = "select * from system where time = (select max(time) from system where time < " //$NON-NLS-1$
                                + startTime + ");"; //$NON-NLS-1$
                List<String> input = SqlManager
                                .executeSelectQuery(query, AnalyzerManager
@@ -270,9 +273,9 @@ public class SnapshotView extends DAView {
                                return;
                        }
                }
+               String[] cpuRates = input.get(LogCenterConstants.DEVICE_SYSTEM_CPU_USAGE_INDEX + 1).split(",");
+               String cpu = cpuRates[cpuRates.length-1].trim();
 
-               String cpu = input
-                               .get(LogCenterConstants.DEVICE_APP_CPU_USAGE_INDEX + 1);
                virtualMem = input.get(LogCenterConstants.DEVICE_VSS_MEMORY_INDEX + 1);
 
                {
@@ -350,8 +353,10 @@ public class SnapshotView extends DAView {
                List<List<String>> inputs = logs.getLogs();
                int lastIndex = inputs.size() - 1;
                List<String> input = inputs.get(lastIndex);
+               
+               String[] cpuRates = input.get(LogCenterConstants.DEVICE_SYSTEM_CPU_USAGE_INDEX).split(",");
+               String cpu = cpuRates[cpuRates.length-1].trim();
 
-               String cpu = input.get(LogCenterConstants.DEVICE_APP_CPU_USAGE_INDEX);
                virtualMem = input.get(LogCenterConstants.DEVICE_VSS_MEMORY_INDEX);
                {
                        String totalMemory = input