Author: chatellier Date: 2010-12-06 14:18:13 +0000 (Mon, 06 Dec 2010) New Revision: 368 Log: Laisse les trou apparent sur les series. Agrandi la shape de la premiere series Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-06 13:48:55 UTC (rev 367) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-06 14:18:13 UTC (rev 368) @@ -27,6 +27,8 @@ import static org.nuiton.i18n.I18n._; +import java.awt.Shape; +import java.awt.geom.Ellipse2D; import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -45,6 +47,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.util.ShapeUtils; import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; @@ -58,6 +61,7 @@ import org.jfree.chart.renderer.category.LineAndShapeRenderer; import org.jfree.data.category.CategoryDataset; import org.jfree.data.category.DefaultCategoryDataset; +import org.jfree.util.ShapeUtilities; import fr.ifremer.coser.CoserBusinessConfig; import fr.ifremer.coser.CoserBusinessException; @@ -204,16 +208,19 @@ DefaultCategoryDataset dataset = new DefaultCategoryDataset(); for (int year = minYear ; year <= maxYear ; ++year) { Double catchNumber = catchNumbers.get(String.valueOf(year)); - if (catchNumber == null) { - catchNumber = 0.0; - } + + // laisse les abscents de captures apparentes + //if (catchNumber == null) { + // catchNumber = 0.0; + //} dataset.setValue(catchNumber, _(Category.CATCH.getTranslationKey()), (Integer)year); if (lengthNumbers != null) { Double lengthNumber = lengthNumbers.get(String.valueOf(year)); - if (lengthNumber == null) { - lengthNumber = 0.0; - } + // laisse les abscents de taille apparentes + //if (lengthNumber == null) { + // lengthNumber = 0.0; + //} dataset.setValue(lengthNumber, _(Category.LENGTH.getTranslationKey()), (Integer)year); } } @@ -245,6 +252,10 @@ CategoryItemRenderer renderer = new LineAndShapeRenderer(); + // agrandit la 2eme serie + Shape firstShape = ShapeUtilities.createDiamond(5F); + renderer.setSeriesShape(0, firstShape); + // n'affiche pas les nombre sur le graphique //StandardCategoryItemLabelGenerator itemLabelGenerator = new StandardCategoryItemLabelGenerator(); //renderer.setBaseItemLabelGenerator(itemLabelGenerator);