Changeset 220 for trunk/src/org/expeditee/items/widgets/charts/AbstractChart.java

Timestamp:

08/13/08 16:21:37 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/items/widgets/charts/AbstractChart.java (modified) (12 diffs)

trunk/src/org/expeditee/items/widgets/charts/AbstractChart.java

@@ -1 +1 @@
 package org.expeditee.items.widgets.charts;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.Paint;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 import javax.swing.JPanel;
@@ -19 +23 @@
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
+import org.jfree.chart.block.BlockBorder;
 import org.jfree.chart.plot.Plot;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.ValueAxisPlot2;
 import org.jfree.chart.title.LegendTitle;
 import org.jfree.chart.title.TextTitle;
+import org.jfree.chart.title.Title;
+import org.jfree.ui.RectangleInsets;
 
 public abstract class AbstractChart extends DataFrameWidget {
@@ -36 +41 @@
 
         private LegendTitle _legend = null;
+
+        protected Map<String, Paint> _paints;
 
         protected JFreeChart getChart() {
@@ -43 +50 @@
         public AbstractChart(Text source, String[] args) {
                 super(source, new JPanel(), 100, 300, -1, 100, 300, -1);
-
+                _paints = new LinkedHashMap<String, Paint>();
                 init();
                 refresh();
@@ -71 +78 @@
                                 switch (key) {
                                 case SizeUp:
-                                        FrameKeyboardActions.SetSize(firstItem, 1, false, true);
+                                        // FrameKeyboardActions.SetSize(firstItem, 1, false, true);
                                         break;
                                 case SizeDown:
-                                        FrameKeyboardActions.SetSize(firstItem, -1, false, true);
+                                        // FrameKeyboardActions.SetSize(firstItem, -1, false, true);
                                         break;
                                 case ChangeColor:
                                         if (e.isControlDown()) {
-                                                Color newColor = ColorUtils.getNextColor(getSource()
-                                                                .getFillColor(), Frame.COLOR_WHEEL, null);
+
                                                 if (e.isShiftDown()) {
-                                                        newColor = null;
-                                                        _chart.getPlot().setBackgroundPaint(
-                                                                        Plot.DEFAULT_BACKGROUND_PAINT);
+                                                        setFillColor(null);
                                                 } else {
-                                                        _chart.getPlot().setBackgroundPaint(newColor);
+                                                        Color newColor = ColorUtils.getNextColor(
+                                                                        getSource().getFillColor(),
+                                                                        Frame.COLOR_WHEEL, null);
+                                                        setFillColor(newColor);
                                                 }
-                                                getSource().setFillColor(newColor);
                                         } else {
-                                                Color newColor = ColorUtils.getNextColor(getSource()
-                                                                .getBackgroundColor(), Frame.COLOR_WHEEL, null);
                                                 if (e.isShiftDown()) {
-                                                        newColor = null;
-                                                        _chart
-                                                                        .setBackgroundPaint(JFreeChart.DEFAULT_BACKGROUND_PAINT);
+                                                        setBackgroundColor(null);
                                                 } else {
-                                                        _chart.setBackgroundPaint(newColor);
+                                                        Color newColor = ColorUtils.getNextColor(
+                                                                        getSource().getColor(), Item.COLOR_WHEEL,
+                                                                        null);
+                                                        setColor(newColor);
                                                 }
-                                                getSource().setBackgroundColor(newColor);
-
                                         }
                                         break;
@@ -112 +115 @@
                 });
                 super._swingComponent = cp;
-                Color c = getSource().getFillColor();
-                if (c != null) {
-                        _chart.getPlot().setBackgroundPaint(c);
-                }
-                c = getSource().getBackgroundColor();
-                if (c != null) {
-                        _chart.setBackgroundPaint(c);
-                }
+
+                setColor(getSource().getColor());
+                setBorderColor(getSource().getBorderColor());
+                setFillColor(getSource().getFillColor());
+                setBackgroundColor(getSource().getBackgroundColor());
+                setThickness(getSource().getThickness(), false);
         }
 
@@ -125 +126 @@
 
         @Override
-        public void refresh() {
+        public final void refresh() {
                 super.refresh();
+                clearData();
                 // Get the data from the linked frame
                 Frame dataFrame = getDataFrame();
-
+                _paints.clear();
                 _chart.clearSubtitles();
 
@@ -154 +156 @@
                         _chart.setTitle(this.getClass().getSimpleName() + " Chart");
                 }
+                _chart.getPlot().setDataPaints(_paints);
                 super._swingComponent.invalidate();
         }
@@ -160 +163 @@
          * @param dataFrame
          */
-        protected void refreshPlot(Frame dataFrame, Plot simplePlot) {
-                if (this.fixedAxis())
-                        return;
-                ValueAxisPlot2 plot = (ValueAxisPlot2) simplePlot;
-                if (dataFrame.hasAnnotation("xaxis")) {
-                        plot.getDomainAxis()
-                                        .setLabel(dataFrame.getAnnotationValue("xaxis"));
-                }
-                if (dataFrame.hasAnnotation("yaxis")) {
-                        plot.getRangeAxis().setLabel(dataFrame.getAnnotationValue("yaxis"));
-                }
-                if (dataFrame.hasAnnotation("horizontal")) {
-                        plot.setOrientation(PlotOrientation.HORIZONTAL);
-                } else {
-                        plot.setOrientation(PlotOrientation.VERTICAL);
-                }
-        }
-
-        private boolean fixedAxis() {
-                return !(this instanceof ValueAxisPlot2);
-        }
+        protected abstract void refreshPlot(Frame dataFrame, Plot simplePlot);
 
         /**
@@ -214 +197 @@
                                         continue;
 
-                                if (foundData |= addCategoryData(category.getText(), linkFrame
+                                String categoryName = category.getText();
+                                if (foundData |= addCategoryData(categoryName, linkFrame
                                                 .getNonAnnotationText(true), swap)) {
+                                        Color backgroundColor = category.getBackgroundColor();
+                                        if (backgroundColor != null)
+                                                _paints.put(categoryName, backgroundColor);
                                         addSubject(linkFrame);
                                 }
@@ -226 +213 @@
                         foundData |= addCategoryData("", textItems, swap);
                 }
-                if (foundData) {
+                /* if (foundData) */{
                         addSubject(dataFrame);
                 }
@@ -237 +224 @@
 
         @Override
-        public void setLink(String link) {
-                super.setLink(link);
-
-                Frame oldDataFrame = getDataFrame();
-                if (oldDataFrame != null)
-                        clearSubjects();
-                setDataFrame(null);
-        }
-
-        @Override
         public float getMinimumBorderThickness() {
                 return 1.0F;
         }
+
+        protected abstract void clearData();
+
+        @Override
+        public void setBackgroundColor(Color c) {
+                super.setBackgroundColor(c);
+                if (_chart == null)
+                        return;
+                if (c == null) {
+                        _chart.setBackgroundPaint(JFreeChart.DEFAULT_BACKGROUND_PAINT);
+                } else {
+                        _chart.setBackgroundPaint(c);
+                }
+        }
+
+        @Override
+        public void setColor(Color c) {
+                super.setColor(c);
+                if (_chart == null)
+                        return;
+                if (c == null) {
+                        _chart.getTitle().setPaint(TextTitle.DEFAULT_TEXT_PAINT);
+                } else {
+                        _chart.getTitle().setPaint(c);
+                }
+                for (Title t : _chart.getSubtitles()) {
+                        if (c == null) {
+                                t.setPaint(TextTitle.DEFAULT_TEXT_PAINT);
+                        } else {
+                                t.setPaint(c);
+                        }
+                }
+                LegendTitle legend = _chart.getLegend();
+                if (legend != null) {
+                        if (c == null) {
+                                legend.setFrame(new BlockBorder(Color.black));
+                        } else {
+                                legend.setFrame(new BlockBorder(c));
+                        }
+                }
+        }
+
+        @Override
+        public void setBorderColor(Color c) {
+                super.setBorderColor(c);
+                if (_chart == null)
+                        return;
+                if (c == null) {
+                        _chart.getPlot().setOutlinePaint(Plot.DEFAULT_OUTLINE_PAINT);
+                } else {
+                        _chart.getPlot().setOutlinePaint(c);
+                }
+        }
+
+        @Override
+        public void setFillColor(Color c) {
+                super.setFillColor(c);
+                if (_chart == null)
+                        return;
+                LegendTitle legend = _chart.getLegend();
+                if (c == null) {
+                        _chart.getPlot().setBackgroundPaint(Plot.DEFAULT_BACKGROUND_PAINT);
+                        if (legend != null)
+                                legend.setBackgroundPaint(null);
+                } else {
+                        _chart.getPlot().setBackgroundPaint(c);
+                        if (legend != null)
+                                legend.setBackgroundPaint(c);
+                }
+        }
+
+        @Override
+        public void setThickness(float newThickness, boolean setConnected) {
+                super.setThickness(newThickness, setConnected);
+                if (_chart == null)
+                        return;
+                _chart.setBorderStroke(new BasicStroke(newThickness));
+                _chart.getPlot().setOutlineStroke(new BasicStroke(newThickness));
+
+                float fontSize = getFontSize(newThickness, TextTitle.DEFAULT_FONT
+                                .getSize2D());
+                LegendTitle legend = _chart.getLegend();
+                if (legend != null) {
+                        legend.setFrame(new BlockBorder(newThickness, newThickness,
+                                        newThickness, newThickness, getSource().getColor()));
+                        legend.setItemFont(legend.getItemFont().deriveFont(fontSize));
+                        float pad = newThickness + 1;
+                        float pad2 = pad;
+                        legend.setItemLabelPadding(new RectangleInsets(pad, pad, pad, pad));
+                        legend.setLegendItemGraphicPadding(new RectangleInsets(pad2, pad2,
+                                        pad2, pad2));
+                        legend.setMargin(newThickness,newThickness,newThickness,newThickness);
+                }
+                float pad0 = newThickness - 1;
+                _chart.setPadding(new RectangleInsets(pad0, pad0, pad0, pad0));
+                TextTitle title = _chart.getTitle();
+                title.setFont(title.getFont().deriveFont(
+                                getFontSize(newThickness, JFreeChart.DEFAULT_TITLE_FONT
+                                                .getSize2D())));
+
+                for (Title t : _chart.getSubtitles()) {
+                        if (t instanceof TextTitle) {
+                                ((TextTitle) t).setFont(legend.getItemFont().deriveFont(
+                                                fontSize));
+                        }
+                        t.setPadding(pad0, pad0, pad0, pad0);
+                }
+        }
+
+        static protected float getFontSize(float newThickness, float oldFontSize) {
+                return (newThickness + 5) * oldFontSize / 6;
+        }
 }