diff -r be6383d38a3a -r fd29fd5a8e29 java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/grafy/CasovyGrafUtoku.java --- a/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/grafy/CasovyGrafUtoku.java Sun Mar 01 01:08:24 2009 +0100 +++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/grafy/CasovyGrafUtoku.java Sun Mar 01 13:04:10 2009 +0100 @@ -1,12 +1,15 @@ package cz.frantovo.hrisniciSpameri.grafy; +import cz.frantovo.hrisniciSpameri.DenniSouhrn; +import cz.frantovo.hrisniciSpameri.dto.Soucet; import de.laures.cewolf.DatasetProduceException; import de.laures.cewolf.DatasetProducer; import de.laures.cewolf.links.CategoryItemLinkGenerator; import de.laures.cewolf.tooltips.CategoryToolTipGenerator; import java.io.Serializable; -import java.util.Calendar; +import java.util.Collection; import java.util.Date; +import java.util.HashMap; import java.util.Map; import org.jfree.data.category.CategoryDataset; import org.jfree.data.time.Day; @@ -22,22 +25,30 @@ private static final long serialVersionUID = -9133218147909088777L; - public XYDataset produceDataset(Map params) throws DatasetProduceException { + public XYDataset produceDataset(Map parametry) throws DatasetProduceException { - System.setProperty("java.awt.headless", "true"); + DenniSouhrn ds = new DenniSouhrn(); + ds.setZacatekString(String.valueOf(parametry.get("zacatek"))); + ds.setKonecString(String.valueOf(parametry.get("konec"))); + ds.setCilString(String.valueOf(parametry.get("cil"))); - TimeSeries timeseries = new TimeSeries("fond", org.jfree.data.time.Day.class); - TimeSeriesCollection dataset = new TimeSeriesCollection(); + HashMap casoveRady = new HashMap(); + for (Collection ss : ds.getSoucty().values()) { - Calendar datum = Calendar.getInstance(); - for (int i = 0; i < 11; i++) { - datum.add(Calendar.DAY_OF_YEAR, -1); - double nahodneCislo = 100 - 10 * i - 20 * Math.random(); - timeseries.add(new Day(datum.getTime()), nahodneCislo); + for (Soucet s : ss) { + if (casoveRady.get(s.getCil().getId()) == null) { + casoveRady.put(s.getCil().getId(), new TimeSeries(s.getCil().getNazev(), org.jfree.data.time.Day.class)); + } + casoveRady.get(s.getCil().getId()).add(new Day(s.getDen()), s.getPocet()); + } } - dataset.addSeries(timeseries); + TimeSeriesCollection dataset = new TimeSeriesCollection(); + for (TimeSeries ts : casoveRady.values()) { + dataset.addSeries(ts); + } + return dataset; }