dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16615
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-09-02 14:14:13 -0400
message:
  PNG charts, fixed inconsistency, DV was using stacked area charts while PNG charts was using area charts
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2014-09-02 17:50:55 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2014-09-02 18:14:13 +0000
@@ -107,6 +107,7 @@
 import org.jfree.chart.renderer.category.BarRenderer;
 import org.jfree.chart.renderer.category.CategoryItemRenderer;
 import org.jfree.chart.renderer.category.LineAndShapeRenderer;
+import org.jfree.chart.renderer.category.StackedAreaRenderer;
 import org.jfree.chart.renderer.category.StackedBarRenderer;
 import org.jfree.chart.title.TextTitle;
 import org.jfree.data.category.CategoryDataset;
@@ -491,13 +492,13 @@
     }
 
     /**
-     * Returns an area renderer.
+     * Returns a stacked area renderer.
      * <p/>
      * TODO centralize these renderer methods.
      */
-    private AreaRenderer getAreaRenderer()
+    private AreaRenderer getStackedAreaRenderer()
     {
-        AreaRenderer renderer = new AreaRenderer();
+        StackedAreaRenderer renderer = new StackedAreaRenderer();
 
         for ( int i = 0; i < COLORS.length; i++ )
         {
@@ -555,7 +556,7 @@
         }
         else if ( chart.isType( TYPE_AREA ) )
         {
-            return getAreaChart( chart, dataSets[0] );
+            return getStackedAreaChart( chart, dataSets[0] );
         }
         else if ( chart.isType( TYPE_PIE ) )
         {
@@ -619,22 +620,22 @@
         return jFreeChart;
     }
 
-    private JFreeChart getAreaChart( BaseChart chart, CategoryDataset dataSet )
+    private JFreeChart getStackedAreaChart( BaseChart chart, CategoryDataset dataSet )
     {
-        JFreeChart areaChart = ChartFactory.createAreaChart( chart.getName(), chart.getDomainAxisLabel(),
+        JFreeChart stackedAreaChart = ChartFactory.createStackedAreaChart( chart.getName(), chart.getDomainAxisLabel(),
             chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, !chart.isHideLegend(), false, false );
 
-        setBasicConfig( areaChart, chart );
+        setBasicConfig( stackedAreaChart, chart );
 
-        CategoryPlot plot = (CategoryPlot) areaChart.getPlot();
+        CategoryPlot plot = (CategoryPlot) stackedAreaChart.getPlot();
         plot.setOrientation( PlotOrientation.VERTICAL );
-        plot.setRenderer( getAreaRenderer() );
+        plot.setRenderer( getStackedAreaRenderer() );
 
         CategoryAxis xAxis = plot.getDomainAxis();
         xAxis.setCategoryLabelPositions( CategoryLabelPositions.UP_45 );
         xAxis.setLabelFont( LABEL_FONT );
 
-        return areaChart;
+        return stackedAreaChart;
     }
 
     private JFreeChart getRadarChart( BaseChart chart, CategoryDataset dataSet )