From cc03a1003a3af094c48ddde4aa3be3b73a0261d4 Mon Sep 17 00:00:00 2001 From: kamuru Date: Wed, 6 Nov 2013 10:43:42 +0900 Subject: [PATCH] [Title] Change view title [Desc.] change context view title [Issue] --- .../dynamicanalyzer/widgets/chart/DAChartRenderer.java | 6 ++---- .../org/tizen/dynamicanalyzer/nl/GLPageLabels.properties | 2 +- .../org/tizen/dynamicanalyzer/ui/opengl/GLConstantMap.java | 2 -- .../ui/opengl/data/inserter/GLContextDataInserter.java | 1 - .../tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java | 13 ++++++------- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java index 5abef97..dd1f1cd 100644 --- a/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java +++ b/org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chart/DAChartRenderer.java @@ -712,13 +712,11 @@ public class DAChartRenderer { if(boundType != null) { if(boundType == DAChartPlot.BoundType.UNDER) { if(seriesItem.getY() < boundValue) { - gc.setBackground(ColorResources.RED); - gc.setAlpha(100); + gc.setBackground(ColorResources.YELLOW); } } else { if(seriesItem.getY() > boundValue) { - gc.setBackground(ColorResources.RED); - gc.setAlpha(100); + gc.setBackground(ColorResources.YELLOW); } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties index 0d479e0..bd447ea 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/GLPageLabels.properties @@ -14,7 +14,7 @@ GL_API_LIST_VIEW_ERROR=Error GL_API_LIST_VIEW_PID=PID GL_API_LIST_VIEW_TID=TID -GL_CONTEXT_VIEW_TITLE=State +GL_CONTEXT_VIEW_TITLE=Context GL_CONTEXT_VIEW_NAME=Name GL_CONTEXT_VIEW_VALUE=Value GL_CONTEXT_VIEW_NAVI=Navigate diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLConstantMap.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLConstantMap.java index 5ba77ac..08f8df5 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLConstantMap.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLConstantMap.java @@ -2,8 +2,6 @@ package org.tizen.dynamicanalyzer.ui.opengl; import java.util.HashMap; -import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; - public class GLConstantMap { private static HashMap constantMap = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/inserter/GLContextDataInserter.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/inserter/GLContextDataInserter.java index 0937e5d..aac4463 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/inserter/GLContextDataInserter.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/inserter/GLContextDataInserter.java @@ -31,7 +31,6 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.sql.DBTableManager; import org.tizen.dynamicanalyzer.sql.SqlManager; -import org.tizen.dynamicanalyzer.ui.opengl.data.GLContextDBEnum; public class GLContextDataInserter implements Runnable { private static GLContextDataQueue contextDatasQueue = new GLContextDataQueue(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java index 4e3f716..521f862 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/chart/CPUChart.java @@ -62,7 +62,7 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; public class CPUChart extends TimelineChart { private static CPUChart instance = null; - private String COMMA = ","; + private static final String COMMA = ","; private DAChartSeries appLoadSeries; private DAChartSeries totalLoadSeries; @@ -153,10 +153,9 @@ public class CPUChart extends TimelineChart { } if (childItem == null) { - Display.getDefault().asyncExec(new Runnable() { + Display.getDefault().syncExec(new Runnable() { @Override public void run() { - childItem = new DAChartBoardItem(item, "Processes"); childItem.useExpand(false); @@ -241,10 +240,10 @@ public class CPUChart extends TimelineChart { ColorResources.SERIES_COLOR_CPU_SYSTEM); newSeries.addSeriesItem(new DAChartSeriesItem(time, load, Formatter.toPercentageFormat(load))); - //FIXME debut - try{ - childItem.getChart().addSeries(newSeries); - } catch(NullPointerException e) { + //FIXME debug + try { + childItem.getChart().addSeries(newSeries); + } catch (NullPointerException e) { e.printStackTrace(); } -- 2.7.4