Author: chatellier Date: 2010-12-06 14:42:50 +0000 (Mon, 06 Dec 2010) New Revision: 370 Log: G?\195?\169n?\195?\169ration des graphique en fin de rapport et liens depuis les erreurs Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.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 14:27:40 UTC (rev 369) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/PublicationService.java 2010-12-06 14:42:50 UTC (rev 370) @@ -28,7 +28,6 @@ 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; @@ -47,7 +46,6 @@ 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; @@ -276,6 +274,9 @@ * Export la liste d'erreurs dans un fichier html avec la liste des graphes * si necessaire. * + * Genere les graphes en fin de fichier avec des liens html pour voir les + * graphes depuis les erreurs. + * * @param project project * @param container data container * @param validationErrors errors list @@ -371,18 +372,18 @@ } out.println(")"); } + + // ajout d'un graph si necessaire + if (error instanceof DiffCatchLengthControlError) { + DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; + String species = diffError.getSpecies(); + out.println(" (<a href='#graph" + species + "'>" + _("coser.business.publication.errorgraph") + "</a>)"); + } + String tipMessage = _(error.getTipMessage()); if (StringUtils.isNotEmpty(error.getTipMessage())) { out.println("<p style='font-style:italic'>" + tipMessage + "</p>"); } - // ajout d'un graph si necessaire - if (error instanceof DiffCatchLengthControlError) { - DiffCatchLengthControlError diffError = (DiffCatchLengthControlError)error; - JFreeChart chart = charts.get(diffError.getSpecies()); - File tmpChartImage = File.createTempFile("chart-", ".jpg", imageDirectory); - ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 800, 400); - out.println("<div><img src='images/" + tmpChartImage.getName() + "' /></div>"); - } out.println("</li>"); } @@ -392,6 +393,18 @@ out.println("</ul>"); } + out.println("<h2>" + _("coser.business.publication.errorgraphs") + "</h2>"); + out.println("<ul>"); + // generation des graphiques + for (Map.Entry<String, JFreeChart> chartEntry : charts.entrySet()) { + JFreeChart chart = chartEntry.getValue(); + File tmpChartImage = File.createTempFile("chart-", ".jpg", imageDirectory); + ChartUtilities.saveChartAsJPEG(tmpChartImage, chart, 800, 400); + out.println("<li><p><a name='graph" + chartEntry.getKey() + "'>" + chartEntry.getKey() + "</a></p>"); + out.println("<img src='images/" + tmpChartImage.getName() + "' /></li>"); + } + out.println("</ul>"); + out.println("</body></html>"); } catch (IOException ex) { Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-06 14:27:40 UTC (rev 369) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2010-12-06 14:42:50 UTC (rev 370) @@ -64,6 +64,8 @@ coser.business.line=Line coser.business.publication.errorexportlines=Lines coser.business.publication.errorexporttitle=Error report for project %s +coser.business.publication.errorgraph=Graph +coser.business.publication.errorgraphs=Graphs coser.business.publication.logexporttitle=Modifications list for project %s coser.business.result.rsufiResultAlreadyExists=Result %s already exists \! coser.business.selection.notValidatedControl=Not validated control \! Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-06 14:27:40 UTC (rev 369) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2010-12-06 14:42:50 UTC (rev 370) @@ -64,6 +64,8 @@ coser.business.line=Ligne coser.business.publication.errorexportlines=Lignes coser.business.publication.errorexporttitle=Rapport d'erreur pour le projet %s +coser.business.publication.errorgraph=Graphique +coser.business.publication.errorgraphs=Graphiques coser.business.publication.logexporttitle=Liste des modifications pour le projet %s coser.business.result.rsufiResultAlreadyExists=Le r\u00E9sultat %D existe d\u00E9j\u00E0 \! coser.business.selection.notValidatedControl=Contr\u00F4le non valid\u00E9 \! Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-06 14:27:40 UTC (rev 369) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/PublicationServiceTest.java 2010-12-06 14:42:50 UTC (rev 370) @@ -175,6 +175,6 @@ Assert.assertTrue(fileContent.indexOf("from \"251.86\" to \"392.98\"") > 0); // clean all - //htmlExport.delete(); + htmlExport.delete(); } }