Change UI

add Legend
remove Zoom

diff --git a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/FDUsageChart.java b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/FDUsageChart.java
index 67cd034..d42d7e7 100644 (file)
--- a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/FDUsageChart.java
+++ b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/FDUsageChart.java
@@ -1,6 +1,5 @@
 package com.samsung.dynamicanalyzer.timeline.chart;
 
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.util.HashSet;
 import java.util.List;
@@ -8,7 +7,6 @@ import java.util.List;
 import org.eclipse.swt.widgets.Display;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
-import org.jfree.chart.labels.StandardXYToolTipGenerator;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
 import org.jfree.data.time.FixedMillisecond;
@@ -76,37 +74,6 @@ public class FDUsageChart extends TimelineChart {
                return chart;
        }
 
-       private void setPlotRange(XYPlot xyplot) {
-
-               xyplot.getDomainAxis().setRange(
-                               TimelineConstants.MS_TO_FIXED_MS - 1,
-                               TimelineConstants.MS_TO_FIXED_MS
-                                               + TimelineConstants.CHART_RANGE_DEFAULT);
-
-       }
-
-       private void setSeriesRendering(XYPlot xyplot) {
-               if (null == chart) {
-                       return;
-               }
-
-               /* Rendering */
-
-               // XYStepRenderer renderer = new XYStepRenderer();
-               XYStepAreaRenderer renderer = new XYStepAreaRenderer(2);
-
-               // renderer.setSeriesStroke(0, new BasicStroke(2.0F));
-               // renderer.setSeriesStroke(1, new BasicStroke(2.0F));
-
-               renderer.setSeriesPaint(1, new Color(0, 255, 0, 80));
-               renderer.setSeriesPaint(0, new Color(0, 0, 255, 80));
-
-               renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());
-               renderer.setDefaultEntityRadius(6);
-               xyplot.setRenderer(renderer);
-
-       }
-
        @Override
        public boolean updateDataSet(Logs logList) {
 
@@ -162,6 +129,36 @@ public class FDUsageChart extends TimelineChart {
                });
        }
 
+       private void setPlotRange(XYPlot xyplot) {
+
+               xyplot.getDomainAxis().setRange(
+                               TimelineConstants.MS_TO_FIXED_MS - 1,
+                               TimelineConstants.MS_TO_FIXED_MS
+                                               + TimelineConstants.CHART_RANGE_DEFAULT);
+
+       }
+
+       private void setSeriesRendering(XYPlot xyplot) {
+               if (null == chart) {
+                       return;
+               }
+
+               /* Rendering */
+
+               // XYStepRenderer renderer = new XYStepRenderer();
+               XYStepAreaRenderer renderer = new XYStepAreaRenderer(2);
+
+               renderer.setSeriesPaint(1, new Color(0, 255, 0, 80));
+               renderer.setSeriesPaint(0, new Color(0, 0, 255, 80));
+
+               renderer.setDefaultEntityRadius(6);
+
+               renderer.setBaseItemLabelsVisible(true);
+
+               xyplot.setRenderer(renderer);
+
+       }
+
        private TimeSeriesCollection createFDDataset() {
 
                TimeSeriesCollection timeDataSet = new TimeSeriesCollection(

diff --git a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/ReadWriteChart.java b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/ReadWriteChart.java
index 4033e70..0a83d47 100644 (file)
--- a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/ReadWriteChart.java
+++ b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/ReadWriteChart.java
@@ -1,6 +1,5 @@
 package com.samsung.dynamicanalyzer.timeline.chart;
 
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.util.List;
 
@@ -8,7 +7,6 @@ import org.eclipse.swt.widgets.Display;
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.SeriesRenderingOrder;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYBarRenderer;
 import org.jfree.data.time.FixedMillisecond;
@@ -98,6 +96,8 @@ public class ReadWriteChart extends TimelineChart {
                renderer.setShadowVisible(false);
                renderer.setDrawBarOutline(false);
 
+               //Tooltip
+               
                xyplot.setRenderer(renderer);
 
        }

diff --git a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/TimelineChart.java b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/TimelineChart.java
index 569a642..70a2ebe 100644 (file)
--- a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/TimelineChart.java
+++ b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/timeline/chart/TimelineChart.java
@@ -7,7 +7,6 @@ import java.text.NumberFormat;
 
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.AxisLocation;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.plot.XYPlot;
@@ -18,6 +17,7 @@ import org.jfree.data.time.TimeSeries;
 import org.jfree.data.time.TimeSeriesCollection;
 import org.jfree.data.xy.XYDataset;
 import org.jfree.ui.HorizontalAlignment;
+import org.jfree.ui.RectangleEdge;
 
 import com.samsung.dynamicanalyzer.constants.TimelineConstants;
 import com.samsung.dynamicanalyzer.model.Logs;
@@ -37,7 +37,7 @@ public abstract class TimelineChart {
                XYDataset dataSet = createDefaultDataset();
 
                JFreeChart chart = ChartFactory.createTimeSeriesChart("Default",
-                               "Time", "Usage", dataSet, true, false, false);
+                               "Time", "Usage", dataSet, true, true, false);
 
                final XYPlot plot = chart.getXYPlot();
 
@@ -99,11 +99,12 @@ public abstract class TimelineChart {
                }
 
                // chart.setAntiAlias(true);
-               // chart.getLegend().setPosition(RectangleEdge.RIGHT);
 
                chart.setBackgroundPaint(new Color(151, 151, 151));
 
-               chart.getLegend().setVisible(false);
+               // chart.getLegend().setVisible(true);
+               chart.getLegend().setPosition(RectangleEdge.TOP);
+               chart.getLegend().setHorizontalAlignment(HorizontalAlignment.RIGHT);
 
                TextTitle texttitle = new TextTitle(chartName);
                texttitle.setHorizontalAlignment(HorizontalAlignment.LEFT);
@@ -122,7 +123,6 @@ public abstract class TimelineChart {
 
                xyplot.getRangeAxis().setLabel(null);
                xyplot.getDomainAxis().setLabel(null);
-               
 
        }
 }

diff --git a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/ui/views/AdditionalTimelineView.java b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/ui/views/AdditionalTimelineView.java
index ba4e5ec..a471e44 100644 (file)
--- a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/ui/views/AdditionalTimelineView.java
+++ b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/ui/views/AdditionalTimelineView.java
@@ -39,6 +39,8 @@ public class AdditionalTimelineView extends ViewPart {
                }\r
 \r
                chartComp = new ChartComposite(parent, SWT.NONE, activeChart, true);\r
+               chartComp.setDomainZoomable(false);\r
+               chartComp.setRangeZoomable(false);\r
        }\r
 \r
        @Override\r

diff --git a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/ui/views/TimelineView.java b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/ui/views/TimelineView.java
index b672431..80cb8ca 100644 (file)
--- a/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/ui/views/TimelineView.java
+++ b/com.samsung.dynamicanalyzer/src/com/samsung/dynamicanalyzer/ui/views/TimelineView.java
@@ -38,6 +38,8 @@ public class TimelineView extends ViewPart {
                }\r
 \r
                chartComp = new ChartComposite(parent, SWT.NONE, activeChart, true);\r
+               chartComp.setDomainZoomable(false);\r
+               chartComp.setRangeZoomable(false);\r
        }\r
 \r
        @Override\r