Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [889] branches/jfreechart-1.0.x-branch/source/org/ jfree/chart/renderer/category/GroupedStackedBarRenderer.java
|
From: <mu...@us...> - 2008-05-07 09:02:39
|
Revision: 889
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=889&view=rev
Author: mungady
Date: 2008-05-07 02:02:37 -0700 (Wed, 07 May 2008)
Log Message:
-----------
Removed trailing whitespace.
Modified Paths:
--------------
branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java
Modified: branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java
===================================================================
--- branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java 2008-05-07 09:01:32 UTC (rev 888)
+++ branches/jfreechart-1.0.x-branch/source/org/jfree/chart/renderer/category/GroupedStackedBarRenderer.java 2008-05-07 09:02:37 UTC (rev 889)
@@ -6,22 +6,22 @@
*
* Project Info: http://www.jfree.org/jfreechart/index.html
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
* in the United States and other countries.]
*
* ------------------------------
@@ -38,13 +38,13 @@
* 08-Jul-2004 : Added equals() method (DG);
* 05-Nov-2004 : Modified drawItem() signature (DG);
* 07-Jan-2005 : Renamed getRangeExtent() --> findRangeBounds (DG);
- * 20-Apr-2005 : Renamed CategoryLabelGenerator
+ * 20-Apr-2005 : Renamed CategoryLabelGenerator
* --> CategoryItemLabelGenerator (DG);
* 22-Sep-2005 : Renamed getMaxBarWidth() --> getMaximumBarWidth() (DG);
* 20-Dec-2007 : Fix for bug 1848961 (DG);
- *
+ *
*/
-
+
package org.jfree.chart.renderer.category;
import java.awt.GradientPaint;
@@ -68,18 +68,18 @@
import org.jfree.util.PublicCloneable;
/**
- * A renderer that draws stacked bars within groups. This will probably be
+ * A renderer that draws stacked bars within groups. This will probably be
* merged with the {@link StackedBarRenderer} class at some point.
*/
-public class GroupedStackedBarRenderer extends StackedBarRenderer
+public class GroupedStackedBarRenderer extends StackedBarRenderer
implements Cloneable, PublicCloneable, Serializable {
-
+
/** For serialization. */
private static final long serialVersionUID = -2725921399005922939L;
-
+
/** A map used to assign each series to a group. */
private KeyToGroupMap seriesToGroupMap;
-
+
/**
* Creates a new renderer.
*/
@@ -87,28 +87,28 @@
super();
this.seriesToGroupMap = new KeyToGroupMap();
}
-
+
/**
- * Updates the map used to assign each series to a group, and sends a
+ * Updates the map used to assign each series to a group, and sends a
* {@link RendererChangeEvent} to all registered listeners.
- *
+ *
* @param map the map (<code>null</code> not permitted).
*/
public void setSeriesToGroupMap(KeyToGroupMap map) {
if (map == null) {
- throw new IllegalArgumentException("Null 'map' argument.");
+ throw new IllegalArgumentException("Null 'map' argument.");
}
- this.seriesToGroupMap = map;
+ this.seriesToGroupMap = map;
fireChangeEvent();
}
-
+
/**
- * Returns the range of values the renderer requires to display all the
+ * Returns the range of values the renderer requires to display all the
* items from the specified dataset.
- *
+ *
* @param dataset the dataset (<code>null</code> permitted).
- *
- * @return The range (or <code>null</code> if the dataset is
+ *
+ * @return The range (or <code>null</code> if the dataset is
* <code>null</code> or empty).
*/
public Range findRangeBounds(CategoryDataset dataset) {
@@ -118,17 +118,17 @@
}
/**
- * Calculates the bar width and stores it in the renderer state. We
- * override the method in the base class to take account of the
+ * Calculates the bar width and stores it in the renderer state. We
+ * override the method in the base class to take account of the
* series-to-group mapping.
- *
+ *
* @param plot the plot.
* @param dataArea the data area.
* @param rendererIndex the renderer index.
* @param state the renderer state.
*/
- protected void calculateBarWidth(CategoryPlot plot,
- Rectangle2D dataArea,
+ protected void calculateBarWidth(CategoryPlot plot,
+ Rectangle2D dataArea,
int rendererIndex,
CategoryItemRendererState state) {
@@ -154,10 +154,10 @@
categoryMargin = xAxis.getCategoryMargin();
}
if (groups > 1) {
- itemMargin = getItemMargin();
+ itemMargin = getItemMargin();
}
- double used = space * (1 - xAxis.getLowerMargin()
+ double used = space * (1 - xAxis.getLowerMargin()
- xAxis.getUpperMargin()
- categoryMargin - itemMargin);
if (columns > 0) {
@@ -171,10 +171,10 @@
}
/**
- * Calculates the coordinate of the first "side" of a bar. This will be
- * the minimum x-coordinate for a vertical bar, and the minimum
+ * Calculates the coordinate of the first "side" of a bar. This will be
+ * the minimum x-coordinate for a vertical bar, and the minimum
* y-coordinate for a horizontal bar.
- *
+ *
* @param plot the plot.
* @param orientation the plot orientation.
* @param dataArea the data area.
@@ -182,11 +182,11 @@
* @param state the renderer state (has the bar width precalculated).
* @param row the row index.
* @param column the column index.
- *
+ *
* @return The coordinate.
*/
- protected double calculateBarW0(CategoryPlot plot,
- PlotOrientation orientation,
+ protected double calculateBarW0(CategoryPlot plot,
+ PlotOrientation orientation,
Rectangle2D dataArea,
CategoryAxis domainAxis,
CategoryItemRendererState state,
@@ -200,7 +200,7 @@
else {
space = dataArea.getWidth();
}
- double barW0 = domainAxis.getCategoryStart(column, getColumnCount(),
+ double barW0 = domainAxis.getCategoryStart(column, getColumnCount(),
dataArea, plot.getDomainAxisEdge());
int groupCount = this.seriesToGroupMap.getGroupCount();
int groupIndex = this.seriesToGroupMap.getGroupIndex(
@@ -208,21 +208,21 @@
plot.getIndexOf(this)).getRowKey(row)));
int categoryCount = getColumnCount();
if (groupCount > 1) {
- double groupGap = space * getItemMargin()
+ double groupGap = space * getItemMargin()
/ (categoryCount * (groupCount - 1));
- double groupW = calculateSeriesWidth(space, domainAxis,
+ double groupW = calculateSeriesWidth(space, domainAxis,
categoryCount, groupCount);
- barW0 = barW0 + groupIndex * (groupW + groupGap)
+ barW0 = barW0 + groupIndex * (groupW + groupGap)
+ (groupW / 2.0) - (state.getBarWidth() / 2.0);
}
else {
- barW0 = domainAxis.getCategoryMiddle(column, getColumnCount(),
- dataArea, plot.getDomainAxisEdge())
+ barW0 = domainAxis.getCategoryMiddle(column, getColumnCount(),
+ dataArea, plot.getDomainAxisEdge())
- state.getBarWidth() / 2.0;
}
return barW0;
}
-
+
/**
* Draws a stacked bar for a specific item.
*
@@ -247,18 +247,18 @@
int row,
int column,
int pass) {
-
+
// nothing is drawn for null values...
Number dataValue = dataset.getValue(row, column);
if (dataValue == null) {
return;
}
-
+
double value = dataValue.doubleValue();
Comparable group = this.seriesToGroupMap.getGroup(
dataset.getRowKey(row));
PlotOrientation orientation = plot.getOrientation();
- double barW0 = calculateBarW0(plot, orientation, dataArea, domainAxis,
+ double barW0 = calculateBarW0(plot, orientation, dataArea, domainAxis,
state, row, column);
double positiveBase = 0.0;
@@ -284,15 +284,15 @@
double translatedValue;
RectangleEdge location = plot.getRangeAxisEdge();
if (value > 0.0) {
- translatedBase = rangeAxis.valueToJava2D(positiveBase, dataArea,
+ translatedBase = rangeAxis.valueToJava2D(positiveBase, dataArea,
location);
- translatedValue = rangeAxis.valueToJava2D(positiveBase + value,
+ translatedValue = rangeAxis.valueToJava2D(positiveBase + value,
dataArea, location);
}
else {
- translatedBase = rangeAxis.valueToJava2D(negativeBase, dataArea,
+ translatedBase = rangeAxis.valueToJava2D(negativeBase, dataArea,
location);
- translatedValue = rangeAxis.valueToJava2D(negativeBase + value,
+ translatedValue = rangeAxis.valueToJava2D(negativeBase + value,
dataArea, location);
}
double barL0 = Math.min(translatedBase, translatedValue);
@@ -301,35 +301,35 @@
Rectangle2D bar = null;
if (orientation == PlotOrientation.HORIZONTAL) {
- bar = new Rectangle2D.Double(barL0, barW0, barLength,
+ bar = new Rectangle2D.Double(barL0, barW0, barLength,
state.getBarWidth());
}
else {
- bar = new Rectangle2D.Double(barW0, barL0, state.getBarWidth(),
+ bar = new Rectangle2D.Double(barW0, barL0, state.getBarWidth(),
barLength);
}
Paint itemPaint = getItemPaint(row, column);
- if (getGradientPaintTransformer() != null
+ if (getGradientPaintTransformer() != null
&& itemPaint instanceof GradientPaint) {
GradientPaint gp = (GradientPaint) itemPaint;
itemPaint = getGradientPaintTransformer().transform(gp, bar);
}
g2.setPaint(itemPaint);
g2.fill(bar);
- if (isDrawBarOutline()
+ if (isDrawBarOutline()
&& state.getBarWidth() > BAR_OUTLINE_WIDTH_THRESHOLD) {
g2.setStroke(getItemStroke(row, column));
g2.setPaint(getItemOutlinePaint(row, column));
g2.draw(bar);
}
- CategoryItemLabelGenerator generator = getItemLabelGenerator(row,
+ CategoryItemLabelGenerator generator = getItemLabelGenerator(row,
column);
if (generator != null && isItemLabelVisible(row, column)) {
- drawItemLabel(g2, dataset, row, column, plot, generator, bar,
+ drawItemLabel(g2, dataset, row, column, plot, generator, bar,
(value < 0.0));
- }
-
+ }
+
// collect entity and tool tip information...
if (state.getInfo() != null) {
EntityCollection entities = state.getEntityCollection();
@@ -337,28 +337,28 @@
addItemEntity(entities, dataset, row, column, bar);
}
}
-
+
}
-
+
/**
* Tests this renderer for equality with an arbitrary object.
- *
+ *
* @param obj the object (<code>null</code> permitted).
- *
+ *
* @return A boolean.
*/
public boolean equals(Object obj) {
if (obj == this) {
- return true;
+ return true;
}
if (!(obj instanceof GroupedStackedBarRenderer)) {
return false;
}
GroupedStackedBarRenderer that = (GroupedStackedBarRenderer) obj;
if (!this.seriesToGroupMap.equals(that.seriesToGroupMap)) {
- return false;
+ return false;
}
return super.equals(obj);
}
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|