[Schmitzm-commits] r272 - trunk/src/schmitzm/jfree/chart/style

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2009-08-01 19:43:57 +0200 (Sat, 01 Aug 2009)
New Revision: 272

Modified:
   trunk/src/schmitzm/jfree/chart/style/AbstractChartStyle.java
   trunk/src/schmitzm/jfree/chart/style/BasicChartStyle.java
   trunk/src/schmitzm/jfree/chart/style/ChartRendererStyle.java
Log:
* Hackingsession: Charts ... 

Modified: trunk/src/schmitzm/jfree/chart/style/AbstractChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/chart/style/AbstractChartStyle.java	2009-08-01 15:36:09 UTC (rev 271)
+++ trunk/src/schmitzm/jfree/chart/style/AbstractChartStyle.java	2009-08-01 17:43:57 UTC (rev 272)
@@ -331,7 +331,7 @@
    * Returns count of renderer for the chart.
    */
   public int getRendererCount() {
-    return maxRendererDatasetIdx;
+    return maxRendererDatasetIdx + 1;
   }
 
   /**

Modified: trunk/src/schmitzm/jfree/chart/style/BasicChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/chart/style/BasicChartStyle.java	2009-08-01 15:36:09 UTC (rev 271)
+++ trunk/src/schmitzm/jfree/chart/style/BasicChartStyle.java	2009-08-01 17:43:57 UTC (rev 272)
@@ -244,9 +244,12 @@
     // XYDataset -> XYLineChart
     if (dataset instanceof XYDataset) {
       chart = ChartFactory.createXYLineChart(
-          getTitleStyle().getLabel(),
-          getAxisStyle(DOMAIN_AXIS).getLabel(),
-          getAxisStyle(RANGE_AXIS).getLabel(),
+          "title",
+          "xAxis",
+          "yAxis",
+//          getTitleStyle().getLabel(),
+//          getAxisStyle(DOMAIN_AXIS).getLabel(),
+//          getAxisStyle(RANGE_AXIS).getLabel(),
           (XYDataset)dataset,
           orientation,
           legend,
@@ -259,9 +262,12 @@
     // CategoryDataset -> LineChart
     if (dataset instanceof CategoryDataset) {
       chart = ChartFactory.createLineChart(
-          getTitleStyle().getLabel(),
-          getAxisStyle(DOMAIN_AXIS).getLabel(),
-          getAxisStyle(RANGE_AXIS).getLabel(),
+              "title",
+              "xAxis",
+              "yAxis",
+//              getTitleStyle().getLabel(),
+//              getAxisStyle(DOMAIN_AXIS).getLabel(),
+//              getAxisStyle(RANGE_AXIS).getLabel(),
           (CategoryDataset)dataset,
           orientation,
           legend,
@@ -283,9 +289,12 @@
     // XYDataset -> XYAreaChart
     if (dataset instanceof XYDataset) {
       chart = ChartFactory.createXYAreaChart(
-          getTitleStyle().getLabel(),
-          getAxisStyle(DOMAIN_AXIS).getLabel(),
-          getAxisStyle(RANGE_AXIS).getLabel(),
+              "title",
+              "xAxis",
+              "yAxis",
+//              getTitleStyle().getLabel(),
+//              getAxisStyle(DOMAIN_AXIS).getLabel(),
+//              getAxisStyle(RANGE_AXIS).getLabel(),
           (XYDataset) dataset,
           orientation,
           legend,
@@ -307,9 +316,12 @@
     // CategoryDataset -> AreaChart
     if (dataset instanceof CategoryDataset) {
       chart = ChartFactory.createAreaChart(
-          getTitleStyle().getLabel(),
-          getAxisStyle(DOMAIN_AXIS).getLabel(),
-          getAxisStyle(RANGE_AXIS).getLabel(),
+              "title",
+              "xAxis",
+              "yAxis",
+//              getTitleStyle().getLabel(),
+//              getAxisStyle(DOMAIN_AXIS).getLabel(),
+//              getAxisStyle(RANGE_AXIS).getLabel(),
           (CategoryDataset)dataset,
           orientation,
           legend,
@@ -334,10 +346,14 @@
     // XYDataset -> XYBarChart
     if (dataset instanceof XYDataset) {
       chart = ChartFactory.createXYBarChart(
-          getTitleStyle().getLabel(),
-          getAxisStyle(DOMAIN_AXIS).getLabel(),
-          false,
-          getAxisStyle(RANGE_AXIS).getLabel(),
+              "title",
+              "xAxis",
+              false,
+              "yAxis",
+//    		  getTitleStyle().getLabel(),
+//          getAxisStyle(DOMAIN_AXIS).getLabel(),
+//          false,
+//          getAxisStyle(RANGE_AXIS).getLabel(),
           (IntervalXYDataset)(dataset instanceof TableXYDataset ? (TableXYDataset)dataset : new XYBarDataset( (XYDataset) dataset, 0.5d)),
           PlotOrientation.VERTICAL,
           true,
@@ -354,9 +370,12 @@
     // CategoryDataset -> BarChart
     if (dataset instanceof CategoryDataset) {
       chart = ChartFactory.createBarChart(
-          getTitleStyle().getLabel(),
-          getAxisStyle(DOMAIN_AXIS).getLabel(),
-          getAxisStyle(RANGE_AXIS).getLabel(),
+              "title",
+              "xAxis",
+              "yAxis",
+//              getTitleStyle().getLabel(),
+//              getAxisStyle(DOMAIN_AXIS).getLabel(),
+//              getAxisStyle(RANGE_AXIS).getLabel(),
           (CategoryDataset)dataset,
           orientation,
           legend,

Modified: trunk/src/schmitzm/jfree/chart/style/ChartRendererStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/chart/style/ChartRendererStyle.java	2009-08-01 15:36:09 UTC (rev 271)
+++ trunk/src/schmitzm/jfree/chart/style/ChartRendererStyle.java	2009-08-01 17:43:57 UTC (rev 272)
@@ -122,7 +122,7 @@
    * Returns the count of series the style is defined for.
    */
   public int getSeriesCount() {
-    return maxSeriesIdx;
+    return maxSeriesIdx + 1;
   }
   
   /**
@@ -334,11 +334,12 @@
       applyToBarRenderer((XYBarRenderer)renderer);
     if (renderer instanceof AbstractXYItemRenderer)
       applyToXYItemRenderer((AbstractXYItemRenderer)renderer);
-    if (renderer instanceof AbstractXYItemRenderer)
+    if (renderer instanceof AbstractCategoryItemRenderer)
       applyToCategoryItemRenderer((AbstractCategoryItemRenderer)renderer);
     
     // notify the listeners about style change
     JFreeChartUtil.fireChangeEvent(renderer);
+    
   }