dive4elements/river: flys-artifacts/src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java comparison

comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java @ 1858:94871b7ce9e9

CrossSectionApp: split curves in separated datasets to make them renderable with different renderers. flys-artifacts/trunk@3207 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Thu, 10 Nov 2011 09:37:59 +0000
parents	d562772a418e
children	0e9c0b49b4ef

comparison

equal deleted inserted replaced

-:7fc87a67e6f7
+:94871b7ce9e9
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.data.xy.XYSeries;
+import org.jfree.data.xy.XYDataset;
 import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.chart.renderer.xy.XYItemRenderer;
 import org.jfree.ui.ApplicationFrame;
 import org.jfree.ui.RefineryUtilities;
 public class CrossSectionApp
 protected void updateChart() {
 CrossSectionLineItem csli =
 (CrossSectionLineItem)crossSectionLinesCB.getSelectedItem();
-JFreeChart chart = createChart(csli == null
+JFreeChart chart = createChart();
-? new XYSeriesCollection()
-: generateDataset());
 chartPanel.setChart(chart);
 }
 protected ChartPanel createChartPanel() {
 CrossSectionLineItem csli =
 (CrossSectionLineItem)crossSectionLinesCB.getSelectedItem();
-JFreeChart chart = createChart(csli == null
+JFreeChart chart = createChart();
-? new XYSeriesCollection()
-: generateDataset());
 return new ChartPanel(chart);
 }
 protected void dumpData() {
 out.close();
 }
 }
 }
-public void generateWaterLevels(
+public XYDataset generateWaterLevels(
+List<Point2D>      points
+) {
+if (points == null || points.isEmpty() || lastWaterLevel == null) {
+return null;
+}
+double [][] data = Lines.createWaterLines(points, lastWaterLevel);
+XYSeries series =
+new XYSeries(String.valueOf(lastWaterLevel), false);
+double [] x = data[0];
+double [] y = data[1];
+for (int i = 0; i < x.length; ++i) {
+series.add(x[i], y[i], false);
+}
+return new XYSeriesCollection(series);
+}
+public XYDataset generateProfile(
 List<Point2D>      points,
-XYSeriesCollection collection
+String             legend
 ) {
 if (points == null || points.isEmpty()) {
-return;
+return null;
-}
-if (lastWaterLevel != null) {
-double [][] data = Lines.createWaterLines(points, lastWaterLevel);
-XYSeries series =
-new XYSeries(String.valueOf(lastWaterLevel), false);
-double [] x = data[0];
-double [] y = data[1];
-for (int i = 0; i < x.length; ++i) {
-series.add(x[i], y[i], false);
-}
-collection.addSeries(series);
-}
-}
-public void generateProfile(
-List<Point2D>      points,
-String             legend,
-XYSeriesCollection collection
-) {
-if (points == null || points.isEmpty()) {
-return;
 }
 double [][] values = CrossSectionLine.fetchCrossSectionProfile(points);
 XYSeries series = new XYSeries(legend, false);
 double [] y = values[1];
 for (int i = 0; i < x.length; ++i) {
 series.add(x[i], y[i], false);
 }
-collection.addSeries(series);
+return new XYSeriesCollection(series);
 }
-public XYSeriesCollection generateDataset() {
+public List<Pair<XYDataset, XYItemRenderer>> generateDatasets() {
-XYSeriesCollection collection = new XYSeriesCollection();
+List<Pair<XYDataset, XYItemRenderer>> pairs =
+new ArrayList<Pair<XYDataset, XYItemRenderer>>();
+return pairs;
+}
+public List<Pair<XYDataset, XYItemRenderer>> generateDataset() {
+List<Pair<XYDataset, XYItemRenderer>> datasets =
+new ArrayList<Pair<XYDataset, XYItemRenderer>>();
 CrossSectionLineItem csli =
 (CrossSectionLineItem)crossSectionLinesCB.getSelectedItem();
 for (int i = 0; i < drawCrossSection.length; ++i) {
 if (drawCrossSection[i]) {
 CrossSection cs = crossSections.get(i);
 for (Pair<CrossSection, CrossSectionLine> csl: csli.lines) {
 if (csl.getA() == cs) {
 points = csl.getB().fetchCrossSectionLinesPoints();
-generateProfile(
-points,
+XYDataset dataset = generateProfile(
-cs.getDescription(),
+points, cs.getDescription());
-collection);
+if (dataset != null) {
+datasets.add(new Pair<XYDataset, XYItemRenderer>(
+dataset, null));
+}
 break;
 }
 }
 }
 for (Pair<CrossSection, CrossSectionLine> csl: csli.lines) {
 if (csl.getA() == cs) {
 if (points != null) {
 points = csl.getB().fetchCrossSectionLinesPoints();
 }
-generateWaterLevels(
+XYDataset dataset = generateWaterLevels(points);
-points,
+if (dataset != null) {
-collection);
+datasets.add(new Pair<XYDataset, XYItemRenderer>(
+dataset, null));
+}
 break;
 }
 }
 }
 }
-return collection;
+return datasets;
 }
 protected Object [] createCrossSectionLineItems(
 Map<Double, List<Pair<CrossSection, CrossSectionLine>>> km2lines
 ) {
 }
 return result;
 }
-public static JFreeChart createChart(XYSeriesCollection collection) {
+public JFreeChart createChart() {
 JFreeChart chart = ChartFactory.createXYLineChart(
 null,
 "Abstand [m]",
 "H\u00f6he [m]",
-collection,
+null,
 PlotOrientation.VERTICAL,
 true,
 true,
 false);
+List<Pair<XYDataset, XYItemRenderer>> datasets =
+generateDataset();
 XYPlot plot = chart.getXYPlot();
+for (int i = 0, N = datasets.size(); i < N; ++i) {
+Pair<XYDataset, XYItemRenderer> p = datasets.get(i);
+plot.setDataset(i, p.getA());
+plot.mapDatasetToRangeAxis(i, 0);
+XYItemRenderer renderer = p.getB();
+if (renderer != null) {
+plot.setRenderer(i, renderer);
+}
+}
 NumberAxis yAxis = (NumberAxis)plot.getRangeAxis();
 yAxis.setAutoRangeIncludesZero(false);
 ChartUtilities.applyCurrentTheme(chart);
 return chart;

Mercurial > dive4elements > river

comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/charts/CrossSectionApp.java @ 1858:94871b7ce9e9