dive4elements/river: flys-artifacts/src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java comparison

comparison flys-artifacts/src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java @ 2071:fd95bfbb2ec2

Allow styling of outline of areas. flys-artifacts/trunk@3575 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Felix Wolfsteller <felix.wolfsteller@intevation.de>
date	Tue, 03 Jan 2012 13:14:42 +0000
parents	1ae17b100973
children	51b9899f819d

comparison

equal deleted inserted replaced

-:48fd8b06bce5
+:fd95bfbb2ec2
 /*
 * For further changes within the FLYS project, refer to the ChangeLog.
 */
 package de.intevation.flys.jfree;
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Paint;
 import java.awt.Shape;
 import java.awt.Stroke;
 private transient Paint negativePaint;
 /** Display shapes at each point? */
 private boolean shapesVisible;
+/** Display shapes at each point? */
+protected boolean drawOutline;
+/** Which stroke to draw outline with? */
+protected Stroke outlineStroke;
+/** Which paint to draw outline with? */
+protected Paint outlinePaint;
 /** The shape to display in the legend item. */
 private transient Shape legendShape;
+protected boolean drawOriginalSeries;
 //private XYDatasetToZeroMapper mapper;
 /**
 * This flag controls whether or not the x-coordinates (in Java2D space)
 "Null 'negativePaint' argument.");
 }
 this.positivePaint = positivePaint;
 this.negativePaint = negativePaint;
 this.shapesVisible = shapes;
-this.legendShape = new Rectangle2D.Double(-3.0, -3.0, 10.0, 10.0);
+this.legendShape   = new Rectangle2D.Double(-3.0, -3.0, 10.0, 10.0);
 this.roundXCoordinates = false;
-}
+this.drawOutline   = true;
+this.outlineStroke = new BasicStroke(1);
+this.outlinePaint  = Color.black;
+this.drawOriginalSeries = false;
+}
+/**
+* Sets color that is used if drawOutline is true.
+*/
+public void setOutlinePaint(Paint outlinePaint) {
+this.outlinePaint = outlinePaint;
+}
+/**
+* Gets color which is used if drawOutline is true.
+*/
+public Paint getOutlinePaint() {
+return this.outlinePaint;
+}
+/**
+* Sets Stroke that is used if drawOutline is true.
+*/
+public void setOutlineStroke(Stroke stroke) {
+this.outlineStroke = stroke;
+}
+/**
+* Returns Stroke that is used if drawOutline is true.
+*/
+public Stroke getOutlineStroke() {
+return this.outlineStroke;
+}
+/**
+* Whether or not to draw the 'Shape' of the area (in contrast to
+* shapes at data items).
+*/
+public void setDrawOutline(boolean doDrawOutline) {
+this.drawOutline = doDrawOutline;
+}
+/**
+* Returns whether or not to draw the shape of the outline.
+*/
+public boolean getDrawOutline() {
+return this.drawOutline;
+}
 /**
 * Returns the paint used to highlight positive differences.
 *
 * @return The paint (never <code>null</code>).
 XYItemRendererState state = super.initialise(g2, dataArea, plot, data,
 info);
 state.setProcessVisibleItemsOnly(false);
 return state;
 }
 /**
 * Returns <code>2</code>, the number of passes required by the renderer.
 * The {@link XYPlot} will run through the dataset this number of times.
 double l_x1 = x_domainAxis.valueToJava2D(l_x0, x_dataArea,
 l_domainAxisLocation);
 double l_y1 = x_rangeAxis.valueToJava2D(l_y0, x_dataArea,
 l_rangeAxisLocation);
+// These are the shapes of the series items.
 if (getShapesVisible()) {
 Shape l_shape = getItemShape(x_series, x_item);
 if (l_orientation == PlotOrientation.HORIZONTAL) {
 l_shape = ShapeUtilities.createTranslatedShape(l_shape,
 l_y1, l_x1);
 l_x1, l_y1);
 }
 if (l_shape.intersects(x_dataArea)) {
 x_graphics.setPaint(getItemPaint(x_series, x_item));
 x_graphics.fill(l_shape);
+/* TODO We could draw the shapes of single items here.
+if (drawOutline) {
+x_graphics.setPaint(this.outlinePaint);
+x_graphics.setStroke(this.outlineStroke);
+x_graphics.draw(l_shape);
+}
+*/
 }
 l_entityArea = l_shape;
-}
+} // if (getShapesVisible())
 // add an entity for the item...
 if (null != l_entities) {
 if (null == l_entityArea) {
 l_entityArea = new Rectangle2D.Double((l_x1 - 2), (l_y1 - 2),
 }
 if ((null != l_line) && l_line.intersects(x_dataArea)) {
 x_graphics.setPaint(getItemPaint(x_series, x_item));
 x_graphics.setStroke(getItemStroke(x_series, x_item));
-x_graphics.draw(l_line);
+if (drawOriginalSeries) {
+x_graphics.setPaint(this.outlinePaint);
+x_graphics.setStroke(this.outlineStroke);
+x_graphics.draw(l_line);
+}
 }
 }
 /**
 * Determines if a dataset is degenerate.  A degenerate dataset is a
 * @param x_yValues  a linked list of the y values (expects values to be
 *                   of type Double).
 */
 private void createPolygon (Graphics2D x_graphics,
 Rectangle2D x_dataArea,
-XYPlot x_plot,
+XYPlot      x_plot,
-ValueAxis x_domainAxis,
+ValueAxis   x_domainAxis,
-ValueAxis x_rangeAxis,
+ValueAxis   x_rangeAxis,
-boolean x_positive,
+boolean     x_positive,
-LinkedList x_xValues,
+LinkedList  x_xValues,
-LinkedList x_yValues) {
+LinkedList  x_yValues) {
 PlotOrientation l_orientation      = x_plot.getOrientation();
 RectangleEdge l_domainAxisLocation = x_plot.getDomainAxisEdge();
 RectangleEdge l_rangeAxisLocation  = x_plot.getRangeAxisEdge();
 if (l_path.intersects(x_dataArea)) {
 x_graphics.setPaint(x_positive ? getPositivePaint()
 : getNegativePaint());
 x_graphics.fill(l_path);
+if (drawOutline) {
+x_graphics.setStroke(this.outlineStroke);
+x_graphics.setPaint(this.outlinePaint);
+x_graphics.draw(l_path);
+}
 }
 }
 /**
 * Returns a default legend item for the specified series.  Subclasses
 Shape line = getLegendLine();
 // Not-filled Shape:
 //result = new LegendItem(label, description,
 //        toolTipText, urlText, line, stroke, paint);
+if (drawOutline) {
+// TODO Include outline style in legenditem (there is a constructor for that)
+}
 // Filled Shape ("Area-Style").
 result = new LegendItem(label, description,
 toolTipText, urlText, line, paint);
 result.setLabelFont(lookupLegendTextFont(series));
 Paint labelPaint = lookupLegendTextPaint(series);
 this.positivePaint = SerialUtilities.readPaint(stream);
 this.negativePaint = SerialUtilities.readPaint(stream);
 this.legendShape = SerialUtilities.readShape(stream);
 }
 }
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/jfree/StableXYDifferenceRenderer.java @ 2071:fd95bfbb2ec2