From 009a3c934cc2be7876f20bacb500f8bd43fa6f40 Mon Sep 17 00:00:00 2001 From: "sanghyunnim.lee" Date: Wed, 27 Jun 2012 13:22:52 +0900 Subject: [PATCH] [Title] change cpu chart string, modify to use ' ,...' log [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../src/org/tizen/dynamicanalyzer/nl/TimelineChartLables.properties | 4 ++-- .../src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java | 2 +- .../src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java | 2 +- .../org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLables.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLables.properties index 142be03..ef638d3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLables.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLables.properties @@ -1,5 +1,5 @@ -CPU_CHART_SERIES_NAME_APP_LOAD=App. Load -CPU_CHART_SERIES_NAME_TOTLA_LOAD=Total Load +CPU_CHART_SERIES_NAME_APP_LOAD=App. +CPU_CHART_SERIES_NAME_TOTLA_LOAD=Total CPU_CHART_TIME=Time CPU_CHART_TITLE=CPU diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java index ad23f1a..9309d6e 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java @@ -201,7 +201,7 @@ public class CPUChart extends TimelineChart { try { time = (long)Double.parseDouble(log.get(LogCenterConstants.DEVICE_TIME_INDEX)) / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS; String[] cpuRates = log.get(LogCenterConstants.DEVICE_SYSTEM_CPU_USAGE_INDEX).split(","); //$NON-NLS-1$ - systemAvgLoad = Double.parseDouble(cpuRates[cpuRates.length - 1]); + systemAvgLoad = Double.parseDouble(cpuRates[cpuRates.length - 1].trim()); } catch (NumberFormatException ne) { ne.printStackTrace(); } catch (NullPointerException ne) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java index 803896d..1aba1a0 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java @@ -244,7 +244,7 @@ public class CPUCoreChart extends TimelineChart { } for(int i = 0; i < coreSize; i++) { - coreInfos[i].newXYDataItems.add(new XYDataItem(time, Double.parseDouble(cpuRates[i]))); + coreInfos[i].newXYDataItems.add(new XYDataItem(time, Double.parseDouble(cpuRates[i].trim()))); } } catch (NumberFormatException ne) { ne.printStackTrace(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java index 50136cf..f21ebf1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java @@ -147,7 +147,7 @@ public class CPUFrequencyChart extends TimelineChart { try { time = Double.parseDouble(log.get(LogCenterConstants.DEVICE_TIME_INDEX)) / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS; String[] cpuFreqs = log.get(LogCenterConstants.DEVICE_CPU_FREQUENCY_INDEX).split(","); //$NON-NLS-1$ - freq1 = Double.parseDouble(cpuFreqs[0]); + freq1 = Double.parseDouble(cpuFreqs[0].trim()); } catch (NumberFormatException ne) { ne.printStackTrace(); } catch (NullPointerException ne) { -- 2.7.4