[SRADA-1019] Add marker line at process chart

Change-Id: I42619b4fae7f8d9832eb4a035cc60aac1811d17a

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java
index 66112b6..9d45dd6 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/chart/GLChartView.java
@@ -64,6 +64,7 @@ import org.tizen.dynamicanalyzer.ui.opengl.data.GLDataManager;
 import org.tizen.dynamicanalyzer.ui.opengl.data.type.GLSelectionData;
 import org.tizen.dynamicanalyzer.ui.page.BaseView;
 import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
+import org.tizen.dynamicanalyzer.ui.timeline.chart.CPUChart;
 import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart;
 import org.tizen.dynamicanalyzer.ui.timeline.common.TimelineConstants;
 import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser;
@@ -78,6 +79,7 @@ import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker;
 import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard;
+import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardHeightChangeableItem;
 import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData;
@@ -599,11 +601,26 @@ public class GLChartView extends DAViewComposite {
                List<TimelineChart> chartList = frameRateChartBoard.getChartList();
                for(TimelineChart chart : chartList) {
                        chart.getChart().getPlot().clearMarkerTime();
+                       
+                       if(chart instanceof CPUChart) {
+                               DAChartBoardHeightChangeableItem proceeChart = ((CPUChart) chart).getProcessChart();
+                               if(proceeChart != null) {
+                                       proceeChart.getChart().getPlot().clearMarkerTime();
+                               }
+                       }
                }
+               
                GLFrameRateChart.getInstance().chart.getPlot().clearMarkerTime();
                for(double time : markerTimeList) {
                        for(TimelineChart chart : chartList) {
                                chart.getChart().getPlot().addMarkerTime(time);
+                               
+                               if(chart instanceof CPUChart) {
+                                       DAChartBoardHeightChangeableItem proceeChart = ((CPUChart) chart).getProcessChart();
+                                       if(proceeChart != null) {
+                                               proceeChart.getChart().getPlot().addMarkerTime(time);
+                                       }
+                               }
                        }
                        GLFrameRateChart.getInstance().chart.getPlot().addMarkerTime(time);
                        frameRateChartBoard.getTimeline().addMarker(time);

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 f2b82fd..c5869ff 100755 (executable)
--- 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
@@ -293,4 +293,8 @@ public class CPUChart extends TimelineChart {
                processItem = null;
                childSeriesMap.clear();
        }
+       
+       public DAChartBoardHeightChangeableItem getProcessChart() {
+               return processItem;
+       }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartView.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartView.java
index 1495fc0..3a75efe 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartView.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/common/TimelineChartView.java
@@ -62,6 +62,7 @@ import org.tizen.dynamicanalyzer.ui.common.UICommonConstants;
 import org.tizen.dynamicanalyzer.ui.page.BaseView;
 import org.tizen.dynamicanalyzer.ui.range.RangeDataManager;
 import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage;
+import org.tizen.dynamicanalyzer.ui.timeline.chart.CPUChart;
 import org.tizen.dynamicanalyzer.ui.timeline.chart.TimelineChart;
 import org.tizen.dynamicanalyzer.ui.timeline.logparser.LifecycleLogParser;
 import org.tizen.dynamicanalyzer.ui.toolbar.DAToolBarCustomCombo;
@@ -73,6 +74,7 @@ import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonRenderer;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChart;
 import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlotIntervalMarker;
 import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoard;
+import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardHeightChangeableItem;
 import org.tizen.dynamicanalyzer.widgets.chartBoard.DAChartBoardItem;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAViewComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAViewData;
@@ -337,10 +339,18 @@ public class TimelineChartView extends DAViewComposite {
                List<TimelineChart> chartList = TimelineChartManager.getInstance().getChartList();
                for(TimelineChart chart : chartList) {
                        chart.getChart().getPlot().clearMarkerTime();
+                       
+                       if(chart instanceof CPUChart && ((CPUChart) chart).getProcessChart() != null) {
+                               ((CPUChart) chart).getProcessChart().getChart().getPlot().clearMarkerTime();
+                       }
                }
                for(double time : markerTimeList) {
                        for(TimelineChart chart : chartList) {
                                chart.getChart().getPlot().addMarkerTime(time);
+                               
+                               if(chart instanceof CPUChart && ((CPUChart) chart).getProcessChart().getChart() != null) {
+                                       ((CPUChart) chart).getProcessChart().getChart().getPlot().addMarkerTime(time);
+                               }
                        }
                        chartBoard.getTimeline().addMarker(time);
                }