From 0755928f956b36d8d1938bb7ad0e7aaa47350345 Mon Sep 17 00:00:00 2001 From: "sanghyunnim.lee" Date: Fri, 27 Jul 2012 17:03:16 +0900 Subject: [PATCH] [Title] Bug fix: parsing error in process chart, Chart border color change [Type] [Module] [Priority] [CQ#] [Redmine#]5728 [Problem] [Cause] [Solution] [TestCase] --- .../src/org/tizen/dynamicanalyzer/AnalyzerManager.java | 6 +++--- .../src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java | 2 +- .../tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java | 6 +++--- .../src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java | 4 +++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java index 3aab35e..6d9894a 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/AnalyzerManager.java @@ -38,7 +38,7 @@ import org.tizen.dynamicanalyzer.model.LeakCheckList; import org.tizen.dynamicanalyzer.model.LogCenter; import org.tizen.dynamicanalyzer.model.Project; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; -import org.tizen.dynamicanalyzer.theme.DAThemeWhite; +import org.tizen.dynamicanalyzer.theme.DAThemeBlack; import org.tizen.dynamicanalyzer.threads.InsertLogThread; import org.tizen.dynamicanalyzer.threads.OpenTraceInputThread; import org.tizen.dynamicanalyzer.threads.RecordStartStopThread; @@ -103,8 +103,8 @@ public class AnalyzerManager { public static DATheme getTheme() { if (null == theme) { -// theme = DAThemeBlack.getInstance(); - theme = DAThemeWhite.getInstance(); + theme = DAThemeBlack.getInstance(); +// theme = DAThemeWhite.getInstance(); } return theme; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java index 16157d5..b95375f 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java @@ -980,7 +980,7 @@ public class TimelineItemManager { iteminfo.infoComp = itemInfoComp; iteminfo.chartComp = itemChartComposite; - + return iteminfo; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java index 12edd7f..a86ba34 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java @@ -243,7 +243,7 @@ public class ProcessMemoryChart extends TimelineChart { try { time = TimelineUtils.transformLogTimeIntoTimelineTime(Double.parseDouble(log.get(LogCenterConstants.DEVICE_TIME_INDEX))) / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS; - value = Integer.parseInt(log.get(LogCenterConstants.DEVICE_VSS_MEMORY_INDEX)); + value = Double.parseDouble(log.get(LogCenterConstants.DEVICE_VSS_MEMORY_INDEX)); } catch (NumberFormatException ne) { ne.printStackTrace(); } catch (NullPointerException ne) { @@ -266,7 +266,7 @@ public class ProcessMemoryChart extends TimelineChart { try { time = Long.parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX)) / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS; - value = Integer.parseInt(log.get(LogCenterConstants.DEVICE_RSS_MEMORY_INDEX)); + value = Double.parseDouble(log.get(LogCenterConstants.DEVICE_RSS_MEMORY_INDEX)); } catch (NumberFormatException ne) { ne.printStackTrace(); } catch (NullPointerException ne) { @@ -285,7 +285,7 @@ public class ProcessMemoryChart extends TimelineChart { try { time = Long.parseLong(log.get(LogCenterConstants.DEVICE_TIME_INDEX)) / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS; - value = Integer.parseInt(log.get(LogCenterConstants.DEVICE_PSS_MEMORY_INDEX)); + value = Double.parseDouble(log.get(LogCenterConstants.DEVICE_PSS_MEMORY_INDEX)); } catch (NumberFormatException ne) { ne.printStackTrace(); } catch (NullPointerException ne) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java index 4e85419..b60227d 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java @@ -5,7 +5,9 @@ import java.awt.Image; import org.jfree.chart.JFreeChart; import org.jfree.chart.plot.XYPlot; +import org.jfree.experimental.swt.SWTUtils; import org.jfree.ui.RectangleInsets; +import org.tizen.dynamicanalyzer.ColorResources; import org.tizen.dynamicanalyzer.ImageResources; import org.tizen.dynamicanalyzer.constants.TimelineConstants; import org.tizen.dynamicanalyzer.utils.TimelineUtils; @@ -76,7 +78,7 @@ public abstract class TimelineChart { return; } - chart.setBackgroundPaint(new Color(50, 50, 50)); + chart.setBackgroundPaint(SWTUtils.toAwtColor(ColorResources.WINDOW_BG_COLOR)); chart.setBorderVisible(false); chart.setBackgroundImageAlpha(1F); -- 2.7.4