Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChartFactory.java @ 86:5d4f5d26bb7a
Some Codecleanup done
gnv-artifacts/trunk@123 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Tim Englich <tim.englich@intevation.de> |
---|---|
date | Thu, 24 Sep 2009 09:39:27 +0000 |
parents | 5c8e54726a58 |
children | 1b12021905b9 |
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChartFactory.java Wed Sep 23 14:32:55 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChartFactory.java Thu Sep 24 09:39:27 2009 +0000 @@ -21,13 +21,11 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Collection; -import java.util.Date; import java.util.Iterator; import org.apache.log4j.Logger; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.AxisLocation; -import org.jfree.chart.axis.DateAxis; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.axis.NumberTickUnit; import org.jfree.chart.encoders.KeypointPNGEncoderAdapter; @@ -35,11 +33,6 @@ import org.jfree.chart.plot.XYPlot; import org.jfree.chart.renderer.xy.StandardXYItemRenderer; import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; -import org.jfree.data.general.Series; -import org.jfree.data.time.Minute; -import org.jfree.data.time.TimeSeries; -import org.jfree.data.time.TimeSeriesCollection; -import org.jfree.data.xy.DefaultXYDataset; import org.jfree.data.xy.XYDataset; import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; @@ -50,16 +43,9 @@ import de.intevation.gnv.transition.describedata.KeyValueDescibeData; /** - * The class <code>ChartFactory</code> fulfills the following purposes: - * <ol> - * <li></li> - * </ol> * - * @author blume - * @version 1.0 - * @serial 1.0 - * @see - * @since 06.12.2007 17:25:59 + * @author Tim Englich <tim.englich@intevation.de> + * */ public class VerticalProfileChartFactory { @@ -70,7 +56,7 @@ private static boolean sDebug = sLogger.isDebugEnabled(); - public synchronized void createSimpleVerticalProfileChart(ChartLabels pLabels, ChartStyle pStyle, String name, Collection<KeyValueDescibeData> parameters, Collection<KeyValueDescibeData> measurements, OutputStream outputStream, Collection<Result> resultSet) throws IOException, TechnicalChartException { + public synchronized void createSimpleVerticalProfileChart(ChartLabels pLabels, ChartStyle pStyle, Collection<KeyValueDescibeData> parameters, Collection<KeyValueDescibeData> measurements, OutputStream outputStream, Collection<Result> resultSet) throws IOException, TechnicalChartException { if (sDebug) sLogger.debug("createSimpleTimeSeriesChart()"); int lLowerLevel = Integer.MIN_VALUE; @@ -85,12 +71,12 @@ } if (sDebug) sLogger.debug(" vor createDataset()"); - XYDataset lSet = createDataset(name, resultSet, lUpperLevel, + XYDataset lSet = this.createDataset(resultSet, lUpperLevel, lLowerLevel,parameters,measurements); if (sDebug) sLogger.debug(" nach createDataset()"); final Color[] color = {Color.black, Color.red, Color.green, Color.blue}; - NumberAxis domain = new NumberAxis("Tiefe"); + NumberAxis domain = new NumberAxis(pLabels.getDomainAxisLabel()); NumberAxis axis; StandardXYItemRenderer renderer = new StandardXYItemRenderer(); XYPlot plot = new XYPlot(); @@ -251,7 +237,7 @@ return series; } - private XYDataset createDataset(String name, Collection<Result> resultSet, + private XYDataset createDataset(Collection<Result> resultSet, int lUpperCut, int lLowerCut,Collection<KeyValueDescibeData> parameters, Collection<KeyValueDescibeData> measurements) throws TechnicalChartException { XYSeriesCollection xyDataset = new XYSeriesCollection();