From: sanghyunnim.lee <sanghyunnim.lee@samsung.com>
Date: Thu, 5 Jul 2012 07:39:38 +0000 (+0900)
Subject: [Title] cpu frequency chart bug fix
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3996bb950969feb3d9ed092d83e177579d189fac;p=sdk%2Ftools%2Fdynamic-analyzer.git

[Title] cpu frequency chart bug fix
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#] 5629
[Problem]
[Cause]
[Solution]
[TestCase]
---

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..cf46578 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
@@ -252,7 +252,6 @@ public class CPUChart extends TimelineChart {
 
 	@Override
 	public void setRenderingBySize() {
-		// TODO Auto-generated method stub
 	}
 	
 	public static String getTooltipContent(int index, double yValue) {
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..5707801 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
@@ -186,12 +186,11 @@ public class CPUFrequencyChart extends TimelineChart {
 	
 	@Override
 	public void setRenderingBySize() {
-		// TODO Auto-generated method stub
 	}
 	
 	public static String getTooltipContent(int index, double yValue) {
 		StringBuilder returnString = new StringBuilder();
 		
-		return returnString.append(getSeriesNameList().get(index)).append(" : ").append(Formatter.toPercentageFormat(yValue)).toString(); //$NON-NLS-1$
+		return returnString.append(getSeriesNameList().get(index)).append(" : ").append(Formatter.toHzFormat(yValue)).toString(); //$NON-NLS-1$
 	}
 }
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ChartDataSetCenter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ChartDataSetCenter.java
index aa56a39..16a2339 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ChartDataSetCenter.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ChartDataSetCenter.java
@@ -88,7 +88,7 @@ public class ChartDataSetCenter {
 				CPUCoreChart.parsingLogList(logs);
 				break;
 			case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
-				CPUCoreChart.parsingLogList(logs);
+				CPUFrequencyChart.parsingLogList(logs);
 				break;
 			case TimelineConstants.CHART_TYPE_PROCESS_SIZE:
 				ProcessMemoryChart.parsingLogList(logs);
diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/Formatter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/Formatter.java
index 60ccf4f..15b0f01 100644
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/Formatter.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/Formatter.java
@@ -227,6 +227,38 @@ public class Formatter {
 		return toByteFormat((long)input);
 	}
 	
+	public static String toHzFormat(long input) {
+		int reminder = 0;
+		long quotient = input;
+		int count = 0;
+		String value = ""; //$NON-NLS-1$
+
+		while (true) {
+			if (quotient >= 1024) {
+				reminder = (int) (quotient % 1024);
+				quotient = quotient / 1024;
+				count++;
+				continue;
+			} else {
+				value = Long.toString(quotient);
+				String remStr = Integer.toString(reminder);
+				if (count > 0) {
+					if (remStr.length() < 3) {
+						value += ".0"; //$NON-NLS-1$
+					} else {
+						value += "." + remStr.substring(0, 1); //$NON-NLS-1$
+					}
+				}
+				value += " " + getHzMeasure(count); //$NON-NLS-1$
+				break;
+			}
+		}
+		return value;
+	}
+	public static String toHzFormat(double input) {
+		return toHzFormat((long)input);
+	}
+	
 	public static String toBpsFormat(long nByte, long startTime, long endTime){
 		String value = ""; //$NON-NLS-1$
 		DecimalFormat df1 = new DecimalFormat("#,##0.00"); //$NON-NLS-1$
@@ -257,4 +289,18 @@ public class Formatter {
 			return "Byte"; //$NON-NLS-1$
 		}
 	}
+	
+	private static String getHzMeasure(int count) {
+		if (count == 4) {
+			return "THz"; //$NON-NLS-1$
+		} else if (count == 3) {
+			return "GHz"; //$NON-NLS-1$
+		} else if (count == 2) {
+			return "MHz"; //$NON-NLS-1$
+		} else if (count == 1) {
+			return "KHz"; //$NON-NLS-1$
+		} else {
+			return "Hz"; //$NON-NLS-1$
+		}
+	}
 }