[jboss-cvs] jboss-seam/src/pdf/org/jboss/seam/pdf/ui ...
Norman Richards
norman.richards at jboss.com
Tue May 8 14:25:16 EDT 2007
User: nrichards
Date: 07/05/08 14:25:16
Modified: src/pdf/org/jboss/seam/pdf/ui UIBarChart.java
UIChart.java UIChartSeries.java UILineChart.java
Added: src/pdf/org/jboss/seam/pdf/ui UICategoryChartBase.java
Log:
more customization for line chart
Revision Changes Path
1.6 +18 -126 jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIBarChart.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIBarChart.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIBarChart.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- UIBarChart.java 6 May 2007 04:53:13 -0000 1.5
+++ UIBarChart.java 8 May 2007 18:25:16 -0000 1.6
@@ -4,16 +4,14 @@
import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart;
-import org.jfree.chart.plot.CategoryPlot;
-import org.jfree.chart.plot.Plot;
-import org.jfree.chart.plot.PlotOrientation;
import org.jfree.chart.renderer.category.BarRenderer;
+import org.jfree.chart.renderer.category.CategoryItemRenderer;
import org.jfree.data.category.CategoryDataset;
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.general.Dataset;
public class UIBarChart
- extends UIChart
+ extends UICategoryChartBase
{
private CategoryDataset dataset;
@@ -26,13 +24,6 @@
private boolean legend;
private boolean is3D = false;
- private Boolean domainGridlinesVisible;
- private String domainGridlinePaint;
- private String domainGridlineStroke;
- private Boolean rangeGridlinesVisible;
- private String rangeGridlinePaint;
- private String rangeGridlineStroke;
-
public void setTitle(String title) {
this.title = title;
}
@@ -77,122 +68,29 @@
this.is3D = true;
}
- public String getDomainGridlinePaint() {
- return (String) valueBinding("domainGridlinePaint", domainGridlinePaint);
- }
-
- public void setDomainGridlinePaint(String domainGridlinePaint) {
- this.domainGridlinePaint = domainGridlinePaint;
- }
-
- public String getDomainGridlineStroke() {
- return (String) valueBinding("domainGridlineStroke", domainGridlineStroke);
- }
-
- public void setDomainGridlineStroke(String domainGridlineStroke) {
- this.domainGridlineStroke = domainGridlineStroke;
- }
-
- public Boolean getDomainGridlinesVisible() {
- return (Boolean) valueBinding("domainGridlinesVisible", domainGridlinesVisible);
- }
-
- public void setDomainGridlinesVisible(Boolean domainGridlinesVisible) {
- this.domainGridlinesVisible = domainGridlinesVisible;
- }
-
- public String getRangeGridlinePaint() {
- return (String) valueBinding("rangeGridlinePaint", rangeGridlinePaint);
- }
-
- public void setRangeGridlinePaint(String rangeGridlinePaint) {
- this.rangeGridlinePaint = rangeGridlinePaint;
- }
-
- public String getRangeGridlineStroke() {
- return (String) valueBinding("rangeGridlineStroke", rangeGridlineStroke);
- }
-
- public void setRangeGridlineStroke(String rangeGridlineStroke) {
- this.rangeGridlineStroke = rangeGridlineStroke;
- }
-
- public Boolean getRangeGridlinesVisible() {
- return (Boolean) valueBinding("rangeGridlinesVisible", rangeGridlinesVisible);
- }
-
- public void setRangeGridlinesVisible(Boolean rangeGridlinesVisible) {
- this.rangeGridlinesVisible = rangeGridlinesVisible;
- }
-
@Override
public void createDataset() {
dataset = new DefaultCategoryDataset();
}
- @Override
- public void configurePlot(Plot p) {
- super.configurePlot(p);
- CategoryPlot plot = (CategoryPlot) p;
- //plot.setAxisOffset(RectangleInsets)
- //plot.setDomainAxisLocation(arg0);
- //plot.setRangeAxisLocation(arg0);
- if (domainGridlinesVisible != null) {
- plot.setDomainGridlinesVisible(domainGridlinesVisible);
- }
- //plot.setDomainGridlinePosition(CategoryAnchor)
- if (domainGridlinePaint != null) {
- plot.setDomainGridlinePaint(findColor(domainGridlinePaint));
- }
- if (domainGridlineStroke != null) {
- plot.setDomainGridlineStroke(findStroke(domainGridlineStroke));
- }
+// @Override
+// public void configurePlot(Plot p) {
+// super.configurePlot(p);
+// }
- if (rangeGridlinesVisible != null) {
- plot.setRangeGridlinesVisible(rangeGridlinesVisible);
- }
- //plot.setRangeGridlinePosition(CategoryAnchor)
- if (rangeGridlinePaint!=null) {
- plot.setRangeGridlinePaint(findColor(rangeGridlinePaint));
+
+ @Override
+ public void configureRenderer(CategoryItemRenderer renderer){
+ super.configureRenderer(renderer);
+ if (renderer instanceof BarRenderer) {
+ configureRenderer((BarRenderer) renderer);
}
- if (rangeGridlineStroke!=null) {
- plot.setRangeGridlineStroke(findStroke(rangeGridlineStroke));
}
- configureRenderer((BarRenderer) plot.getRenderer());
-
- }
public void configureRenderer(BarRenderer renderer) {
- //renderer.setItemMargin(0.0);
-
-// renderer.setBase(arg0);
-// renderer.setBaseFillPaint(arg0);
-// renderer.setBaseItemLabelFont(arg0);
-// renderer.setBaseItemLabelPaint(arg0);
-// renderer.setBaseItemLabelsVisible(arg0);
-// renderer.setBaseOutlinePaint(arg0);
-// renderer.setBaseOutlineStroke(arg0);
-// renderer.setBaseSeriesVisible(arg0);
-// renderer.setBaseSeriesVisibleInLegend(arg0);
-// renderer.setBaseShape(arg0);
-// renderer.setBaseStroke();
-// renderer.setFillPaint(arg0);
-// renderer.setItemLabelFont(arg0);
-// renderer.setItemLabelPaint(arg0);
-// renderer.setItemLabelsVisible(arg0);
-// renderer.setItemMargin(arg0);
-// renderer.setOutlinePaint(arg0)
-// renderer.setOutlineStroke(arg0)
-// renderer.setPaint(arg0);
-// renderer.setStroke(arg0);
-
-
-
- //renderer.setBaseOutlineStroke(new BasicStroke(2f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER, 10f,
- //new float[] {10,3}, 0));
}
@@ -224,13 +122,7 @@
return dataset;
}
- public PlotOrientation plotOrientation(String orientation) {
- if (orientation != null && orientation.equalsIgnoreCase("horizontal")) {
- return PlotOrientation.HORIZONTAL;
- } else {
- return PlotOrientation.VERTICAL;
- }
- }
+
1.6 +8 -1 jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChart.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIChart.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChart.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- UIChart.java 3 May 2007 02:33:12 -0000 1.5
+++ UIChart.java 8 May 2007 18:25:16 -0000 1.6
@@ -12,6 +12,7 @@
import org.jboss.seam.pdf.ITextUtils;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.plot.Plot;
+import org.jfree.chart.plot.PlotOrientation;
import org.jfree.data.general.Dataset;
import com.lowagie.text.*;
@@ -212,7 +213,13 @@
}
}
-
+ public PlotOrientation plotOrientation(String orientation) {
+ if (orientation != null && orientation.equalsIgnoreCase("horizontal")) {
+ return PlotOrientation.HORIZONTAL;
+ } else {
+ return PlotOrientation.VERTICAL;
+ }
+ }
@Override
public void encodeBegin(FacesContext context)
1.2 +39 -30 jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChartSeries.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIChartSeries.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UIChartSeries.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIChartSeries.java 6 May 2007 04:53:13 -0000 1.1
+++ UIChartSeries.java 8 May 2007 18:25:16 -0000 1.2
@@ -6,7 +6,8 @@
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.Plot;
-import org.jfree.chart.renderer.category.BarRenderer;
+import org.jfree.chart.renderer.AbstractRenderer;
+import org.jfree.chart.renderer.category.CategoryItemRenderer;
import org.jfree.data.category.CategoryDataset;
import org.jfree.data.general.Dataset;
@@ -90,7 +91,6 @@
public void encodeEnd(FacesContext context)
throws IOException
{
-
UIChart chart = (UIChart) findITextParent(getParent(), UIChart.class);
Dataset dataset = chart.getDataset();
if (chart != null) {
@@ -100,7 +100,21 @@
int seriesIndex = ((CategoryDataset) dataset).getRowIndex(key);
- BarRenderer renderer = (BarRenderer) plot.getRenderer();
+ CategoryItemRenderer renderer = plot.getRenderer();
+
+ // CategoryRenderer
+ if (renderer instanceof AbstractRenderer) {
+ configureSeries((AbstractRenderer) renderer,seriesIndex);
+ } else {
+ System.out.println("render is not AbtractRenderer" + renderer);
+ }
+ }
+ }
+
+ }
+
+
+ private void configureSeries(AbstractRenderer renderer, int seriesIndex) {
if (seriesPaint != null) {
renderer.setSeriesPaint(seriesIndex, UIChart.findColor(getSeriesPaint()));
}
@@ -128,14 +142,9 @@
if (seriesVisibleInLegend != null) {
renderer.setSeriesVisibleInLegend(seriesIndex, getSeriesVisibleInLegend());
}
-
}
- }
-
- }
-
@Override
public void createITextObject(FacesContext context) {
}
1.4 +50 -37 jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UILineChart.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UILineChart.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UILineChart.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- UILineChart.java 3 May 2007 02:33:12 -0000 1.3
+++ UILineChart.java 8 May 2007 18:25:16 -0000 1.4
@@ -4,14 +4,13 @@
import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart;
-import org.jfree.chart.plot.Plot;
-import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.renderer.category.CategoryItemRenderer;
import org.jfree.data.category.CategoryDataset;
import org.jfree.data.category.DefaultCategoryDataset;
import org.jfree.data.general.Dataset;
public class UILineChart
- extends UIChart
+ extends UICategoryChartBase
{
String title;
String domainAxisLabel;
@@ -20,40 +19,55 @@
String orientation;
boolean legend;
- boolean tooltips;
- boolean urls;
boolean is3D = false;
+ public String getTitle() {
+ return (String) valueBinding("title", title);
+ }
+
public void setTitle(String title) {
this.title = title;
}
+ public String getOrientation() {
+ return (String) valueBinding("orientation", orientation);
+ }
+
public void setOrientation(String orientation) {
this.orientation = orientation;
}
+ public String getDomainAxisLabel() {
+ return (String) valueBinding("domainAxisLabel", domainAxisLabel);
+ }
+
public void setDomainAxisLabel(String domainAxisLabel) {
this.domainAxisLabel = domainAxisLabel;
}
+
+ public String getRangeAxisLabel() {
+ return (String) valueBinding("rangeAxisLabel", rangeAxisLabel);
+ }
+
public void setRangeAxisLabel(String rangeAxisLabel) {
this.rangeAxisLabel = rangeAxisLabel;
}
- public void setLegend(boolean legend) {
- this.legend = legend;
+ public boolean getLegend() {
+ return (Boolean) valueBinding("legend", legend);
}
- public void setTooltips(boolean tooltips) {
- this.tooltips = tooltips;
+ public void setLegend(boolean legend) {
+ this.legend = legend;
}
- public void setUrls(boolean urls) {
- this.urls = urls;
+ public boolean getIs3D() {
+ return (Boolean) valueBinding("is3D", is3D);
}
public void setIs3D(boolean is3D) {
- this.is3D = true;
+ this.is3D = is3D;
}
@Override
@@ -65,28 +79,35 @@
public JFreeChart createChart(FacesContext context) {
if (!is3D) {
return ChartFactory.createLineChart(title,
- domainAxisLabel,
- rangeAxisLabel,
+ getDomainAxisLabel(),
+ getRangeAxisLabel(),
dataset,
- plotOrientation(orientation),
- legend,
- tooltips,
- urls);
+ plotOrientation(getOrientation()),
+ getLegend(),
+ false,
+ false);
} else {
return ChartFactory.createLineChart3D(title,
- domainAxisLabel,
- rangeAxisLabel,
+ getDomainAxisLabel(),
+ getRangeAxisLabel(),
dataset,
- plotOrientation(orientation),
- legend,
- tooltips,
- urls);
+ plotOrientation(getOrientation()),
+ getLegend(),
+ false,
+ false);
}
}
- @Override
- public void configurePlot(Plot plot) {
+// @Override
+// public void configurePlot(Plot p) {
+// super.configurePlot(p);
+// }
+
+ @Override
+ public void configureRenderer(CategoryItemRenderer renderer){
+ super.configureRenderer(renderer);
+ System.out.println("UILINECHART RENDERER IS " + renderer);
}
@Override
@@ -94,12 +115,4 @@
return dataset;
}
- public PlotOrientation plotOrientation(String orientation) {
- if (orientation != null && orientation.equalsIgnoreCase("horizontal")) {
- return PlotOrientation.HORIZONTAL;
- } else {
- return PlotOrientation.VERTICAL;
- }
- }
-
}
1.1 date: 2007/05/08 18:25:16; author: nrichards; state: Exp;jboss-seam/src/pdf/org/jboss/seam/pdf/ui/UICategoryChartBase.java
Index: UICategoryChartBase.java
===================================================================
package org.jboss.seam.pdf.ui;
import org.jfree.chart.plot.CategoryPlot;
import org.jfree.chart.plot.Plot;
import org.jfree.chart.renderer.category.CategoryItemRenderer;
public abstract class UICategoryChartBase
extends UIChart
{
private Boolean domainGridlinesVisible;
private String domainGridlinePaint;
private String domainGridlineStroke;
private Boolean rangeGridlinesVisible;
private String rangeGridlinePaint;
private String rangeGridlineStroke;
public String getDomainGridlinePaint() {
return (String) valueBinding("domainGridlinePaint", domainGridlinePaint);
}
public void setDomainGridlinePaint(String domainGridlinePaint) {
this.domainGridlinePaint = domainGridlinePaint;
}
public String getDomainGridlineStroke() {
return (String) valueBinding("domainGridlineStroke", domainGridlineStroke);
}
public void setDomainGridlineStroke(String domainGridlineStroke) {
this.domainGridlineStroke = domainGridlineStroke;
}
public Boolean getDomainGridlinesVisible() {
return (Boolean) valueBinding("domainGridlinesVisible", domainGridlinesVisible);
}
public void setDomainGridlinesVisible(Boolean domainGridlinesVisible) {
this.domainGridlinesVisible = domainGridlinesVisible;
}
public String getRangeGridlinePaint() {
return (String) valueBinding("rangeGridlinePaint", rangeGridlinePaint);
}
public void setRangeGridlinePaint(String rangeGridlinePaint) {
this.rangeGridlinePaint = rangeGridlinePaint;
}
public String getRangeGridlineStroke() {
return (String) valueBinding("rangeGridlineStroke", rangeGridlineStroke);
}
public void setRangeGridlineStroke(String rangeGridlineStroke) {
this.rangeGridlineStroke = rangeGridlineStroke;
}
public Boolean getRangeGridlinesVisible() {
return (Boolean) valueBinding("rangeGridlinesVisible", rangeGridlinesVisible);
}
public void setRangeGridlinesVisible(Boolean rangeGridlinesVisible) {
this.rangeGridlinesVisible = rangeGridlinesVisible;
}
@Override
public void configurePlot(Plot plot) {
super.configurePlot(plot);
if (plot instanceof CategoryPlot) {
configurePlot((CategoryPlot) plot);
} else {
System.out.println("UICATEGORYCHART --- unknown plot " + plot);
}
}
public void configurePlot(CategoryPlot plot) {
//plot.setAxisOffset(RectangleInsets)
//plot.setDomainAxisLocation(arg0);
//plot.setRangeAxisLocation(arg0);
if (domainGridlinesVisible != null) {
plot.setDomainGridlinesVisible(domainGridlinesVisible);
}
//plot.setDomainGridlinePosition(CategoryAnchor)
if (domainGridlinePaint != null) {
plot.setDomainGridlinePaint(findColor(domainGridlinePaint));
}
if (domainGridlineStroke != null) {
plot.setDomainGridlineStroke(findStroke(domainGridlineStroke));
}
if (rangeGridlinesVisible != null) {
plot.setRangeGridlinesVisible(rangeGridlinesVisible);
}
//plot.setRangeGridlinePosition(CategoryAnchor)
if (rangeGridlinePaint!=null) {
plot.setRangeGridlinePaint(findColor(rangeGridlinePaint));
}
if (rangeGridlineStroke!=null) {
plot.setRangeGridlineStroke(findStroke(rangeGridlineStroke));
}
configureRenderer(plot.getRenderer());
}
public void configureRenderer(CategoryItemRenderer renderer){
//renderer.setItemMargin(0.0);
// renderer.setBase(arg0);
// renderer.setBaseFillPaint(arg0);
// renderer.setBaseItemLabelFont(arg0);
// renderer.setBaseItemLabelPaint(arg0);
// renderer.setBaseItemLabelsVisible(arg0);
// renderer.setBaseOutlinePaint(arg0);
// renderer.setBaseOutlineStroke(arg0);
// renderer.setBaseSeriesVisible(arg0);
// renderer.setBaseSeriesVisibleInLegend(arg0);
// renderer.setBaseShape(arg0);
// renderer.setBaseStroke();
// renderer.setFillPaint(arg0);
// renderer.setItemLabelFont(arg0);
// renderer.setItemLabelPaint(arg0);
// renderer.setItemLabelsVisible(arg0);
// renderer.setItemMargin(arg0);
// renderer.setOutlinePaint(arg0)
// renderer.setOutlineStroke(arg0)
// renderer.setPaint(arg0);
// renderer.setStroke(arg0);
//renderer.setBaseOutlineStroke(new BasicStroke(2f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER, 10f,
//new float[] {10,3}, 0));
}
}
More information about the jboss-cvs-commits
mailing list