Author: bleny Date: 2014-06-12 12:08:48 +0200 (Thu, 12 Jun 2014) New Revision: 2028 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2028 Log: remove BarChartData, use JFreeChart now Removed: trunk/wao-services/src/main/java/fr/ifremer/wao/services/utils/ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java Deleted: trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java 2014-06-12 09:10:25 UTC (rev 2027) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/converter/BarChartDataConverter.java 2014-06-12 10:08:48 UTC (rev 2028) @@ -1,148 +0,0 @@ -package fr.ifremer.wao.web.converter; - -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import fr.ifremer.wao.WaoTechnicalException; -import fr.ifremer.wao.services.utils.BarChartData; -import fr.ifremer.wao.services.utils.ChartDataAxis; -import org.apache.commons.lang3.StringUtils; -import org.apache.struts2.util.StrutsTypeConverter; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class BarChartDataConverter extends StrutsTypeConverter { - - @Override - public Object convertFromString(Map context, String[] values, Class toClass) { - throw new UnsupportedOperationException(); - } - - @Override - public String convertToString(Map context, Object o) { - - if (o instanceof BarChartData) { - - BarChartData barChartData = (BarChartData) o; - - barChartData.computeAxises(); - - String data = toData(barChartData); - - String options = toOptions(barChartData); - - String result = data + ", " + options; - - return result; - - } else { - throw new WaoTechnicalException("unable to convert " + o); - } - } - - protected String toOptions(BarChartData barChartData) { - String options = ""; - options +="{\n"; - options +=" title: \"" + barChartData.getTitle() + "\",\n"; - options +=" seriesDefaults: {\n"; - options +=" renderer: $.jqplot.BarRenderer, \n"; - options +=" rendererOptions: { \n"; - options +=" highlightMouseOver: true, \n"; - options +=" barWidth: 10 \n"; - options +=" } \n"; - options +=" },\n"; -// options +=" axesDefaults: {\n"; -// options +=" tickRenderer: $.jqplot.CanvasAxisTickRenderer, \n"; -// options +=" tickOptions: { \n"; -// options +=" angle: -90, \n"; -// options +=" fontSize: '10pt' \n"; -// options +=" } \n"; -// options +=" },\n"; - options +=" axes: {\n"; - options +=" xaxis: {\n"; - options +=" renderer: $.jqplot.CategoryAxisRenderer, \n"; - options +=" ticks: [\"" + Joiner.on("\", \"").join(barChartData.getTicks()) + "\"]" ; - options +=" },\n"; - - ChartDataAxis yaxis = barChartData.getYAxis(); - options +=" yaxis:{\n "; - options +=" min: " + yaxis.getMin() + ",\n"; - options +=" max: " + yaxis.getMax() + ",\n"; - options +=" numberTicks: " + yaxis.getNumberTicks() + ",\n"; - options +=" label: \"" + yaxis.getLabel() + "\"\n"; - options +=" },\n"; - - if (barChartData.isTwoYAxis()) { - - ChartDataAxis y2axis = barChartData.getY2Axis(); - options +=" y2axis:{\n "; - options +=" min: " + y2axis.getMin() + ",\n"; - options +=" max: " + y2axis.getMax() + ",\n"; - options +=" numberTicks: " + y2axis.getNumberTicks() + ",\n"; - options +=" label: \"" + y2axis.getLabel() + "\"\n"; - options +=" },\n"; - - } - - options +=" },\n"; - options +=" series: [\n"; - - for (BarChartData.BarChartDataSeries series : barChartData.getBarChartDataSeriesForYAxis()) { - - options +=" {\n"; - options +=" yaxis:\"yaxis\",\n"; - options +=" label: \"" + series.getLabel() + "\"\n"; - options +=" },\n"; - } - - for (BarChartData.BarChartDataSeries series : barChartData.getBarChartDataSeriesForY2Axis()) { - - options +=" {\n"; - options +=" yaxis:\"y2axis\",\n"; - options +=" label: \"" + series.getLabel() + "\"\n"; - options +=" },\n"; - } - - options +=" ],\n"; - options +=" legend: {\n"; - options +=" show: true,\n"; - options +=" placement: \"outsideGrid\",\n"; - options +=" location: \"s\",\n"; - options +=" rendererOptions: {\n"; - options +=" numberColumns: 2\n"; - options +=" },\n"; - options +=" renderer: $.jqplot.EnhancedLegendRenderer\n"; - options +=" }\n"; - options +="}\n"; - - return options; - } - - protected String toData(BarChartData barChartData) { - - Set<String> ticks = barChartData.getTicks(); - - List<String> series = new LinkedList<>(); - - List<BarChartData.BarChartDataSeries> barChartDataSeriesList = Lists.newLinkedList(); - barChartDataSeriesList.addAll(barChartData.getBarChartDataSeriesForYAxis()); - barChartDataSeriesList.addAll(barChartData.getBarChartDataSeriesForY2Axis()); - - for (BarChartData.BarChartDataSeries BarChartDataSeries : barChartDataSeriesList) { - List<String> bars = Lists.newLinkedList(); - for (String tick : ticks) { - Double value = BarChartDataSeries.getValue(tick); - if (value == null) { - bars.add("0"); - } else { - bars.add(value.toString()); - } - } - series.add("[" + StringUtils.join(bars, ", ") + "]"); - } - return "[" + StringUtils.join(series, ", ") + "]"; - } - -} \ No newline at end of file