1.1 --- a/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/grafy/CasovyGrafUtoku.java	Sun Mar 01 01:08:24 2009 +0100
     1.2 +++ b/java/HrisniciSpameri/src/java/cz/frantovo/hrisniciSpameri/grafy/CasovyGrafUtoku.java	Sun Mar 01 13:04:10 2009 +0100
     1.3 @@ -1,12 +1,15 @@
     1.4  package cz.frantovo.hrisniciSpameri.grafy;
     1.5  
     1.6 +import cz.frantovo.hrisniciSpameri.DenniSouhrn;
     1.7 +import cz.frantovo.hrisniciSpameri.dto.Soucet;
     1.8  import de.laures.cewolf.DatasetProduceException;
     1.9  import de.laures.cewolf.DatasetProducer;
    1.10  import de.laures.cewolf.links.CategoryItemLinkGenerator;
    1.11  import de.laures.cewolf.tooltips.CategoryToolTipGenerator;
    1.12  import java.io.Serializable;
    1.13 -import java.util.Calendar;
    1.14 +import java.util.Collection;
    1.15  import java.util.Date;
    1.16 +import java.util.HashMap;
    1.17  import java.util.Map;
    1.18  import org.jfree.data.category.CategoryDataset;
    1.19  import org.jfree.data.time.Day;
    1.20 @@ -22,22 +25,30 @@
    1.21  
    1.22      private static final long serialVersionUID = -9133218147909088777L;
    1.23  
    1.24 -    public XYDataset produceDataset(Map params) throws DatasetProduceException {
    1.25 +    public XYDataset produceDataset(Map parametry) throws DatasetProduceException {
    1.26  
    1.27 -        System.setProperty("java.awt.headless", "true");
    1.28 +        DenniSouhrn ds = new DenniSouhrn();
    1.29 +        ds.setZacatekString(String.valueOf(parametry.get("zacatek")));
    1.30 +        ds.setKonecString(String.valueOf(parametry.get("konec")));
    1.31 +        ds.setCilString(String.valueOf(parametry.get("cil")));
    1.32  
    1.33 -        TimeSeries timeseries = new TimeSeries("fond", org.jfree.data.time.Day.class);
    1.34 -        TimeSeriesCollection dataset = new TimeSeriesCollection();
    1.35 +        HashMap<Integer, TimeSeries> casoveRady = new HashMap<Integer, TimeSeries>();
    1.36  
    1.37 +        for (Collection<Soucet> ss : ds.getSoucty().values()) {
    1.38  
    1.39 -        Calendar datum = Calendar.getInstance();
    1.40 -        for (int i = 0; i < 11; i++) {
    1.41 -            datum.add(Calendar.DAY_OF_YEAR, -1);
    1.42 -            double nahodneCislo = 100 - 10 * i - 20 * Math.random();
    1.43 -            timeseries.add(new Day(datum.getTime()), nahodneCislo);
    1.44 +            for (Soucet s : ss) {
    1.45 +                if (casoveRady.get(s.getCil().getId()) == null) {
    1.46 +                    casoveRady.put(s.getCil().getId(), new TimeSeries(s.getCil().getNazev(), org.jfree.data.time.Day.class));
    1.47 +                }
    1.48 +                casoveRady.get(s.getCil().getId()).add(new Day(s.getDen()), s.getPocet());
    1.49 +            }
    1.50          }
    1.51  
    1.52 -        dataset.addSeries(timeseries);
    1.53 +        TimeSeriesCollection dataset = new TimeSeriesCollection();
    1.54 +        for (TimeSeries ts : casoveRady.values()) {
    1.55 +            dataset.addSeries(ts);
    1.56 +        }
    1.57 +
    1.58          return dataset;
    1.59      }
    1.60