diff artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java @ 7075:253d80af5b7f generator-refactoring

More Processor refactoring - Unify aandf aaf and bundle variable names to bundle - Factor out diagram inversion code - Add function with new signature to BedDiffYear and QOut processors
author Andre Heinecke <aheinecke@intevation.de>
date Fri, 20 Sep 2013 16:25:43 +0200
parents 1011a40ee79c
children 3c4efd4b2c19
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java	Fri Sep 20 15:44:39 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java	Fri Sep 20 16:25:43 2013 +0200
@@ -19,6 +19,7 @@
 
 import org.dive4elements.river.exports.StyledSeriesBuilder;
 import org.dive4elements.river.exports.XYChartGenerator;
+import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.jfree.StyledXYSeries;
 import org.dive4elements.river.themes.ThemeDocument;
 import org.dive4elements.river.utils.DataUtil;
@@ -36,16 +37,40 @@
 
     @Override
     public void doOut(
+            DiagramGenerator generator,
+            ArtifactAndFacet bundle,
+            ThemeDocument    theme,
+            boolean          visible) {
+        CallContext context = generator.getCallContext();
+        WQKms wqkms = (WQKms) bundle.getData(context);
+
+        XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme);
+
+        StyledSeriesBuilder.addStepPointsKmQ(series, wqkms);
+
+        generator.addAxisSeries(series, axisName, visible);
+
+        generator.handleLTRWaterFlowInversion(wqkms);
+    }
+
+    @Override
+    public void doOut(
             XYChartGenerator generator,
-            ArtifactAndFacet aaf,
+            ArtifactAndFacet bundle,
             ThemeDocument    theme,
             boolean          visible,
             int              index)
     {
         CallContext context = generator.getCallContext();
-        WQKms wqkms = (WQKms) aaf.getData(context);
+        WQKms wqkms = (WQKms) bundle.getData(context);
 
-        doQOut(generator, wqkms, aaf, theme, visible, index);
+        XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme);
+
+        StyledSeriesBuilder.addStepPointsKmQ(series, wqkms);
+
+        generator.addAxisSeries(series, index, visible);
+
+        invertAxis(generator, wqkms);
     }
 
     /**
@@ -65,38 +90,6 @@
         return false;
     }
 
-
-    /**
-     * Process the output for Q facets in a longitudinal section curve.
-     *
-     * @param generator Generator to use.
-     * @param wqkms An array of WQKms values.
-     * @param aandf The facet and artifact. This facet does NOT support any data objects. Use
-     * D4EArtifact.getNativeFacet() instead to retrieve a Facet which supports
-     * data.
-     * @param theme The theme that contains styling information.
-     * @param visible The visibility of the curve.
-     * @param index Axis index to add data to.
-     */
-    protected void doQOut(
-        XYChartGenerator generator,
-        WQKms    wqkms,
-        ArtifactAndFacet aaf,
-        ThemeDocument theme,
-        boolean  visible,
-        int index
-    ) {
-        logger.debug("QProcessor.doOut");
-
-        XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
-
-        StyledSeriesBuilder.addStepPointsKmQ(series, wqkms);
-
-        generator.addAxisSeries(series, index, visible);
-
-        invertAxis(generator, wqkms);
-    }
-
     /**
      * This method determines - taking JFreeCharts auto x value ordering into
      * account - if the x axis need to be inverted. Waterlines in these charts

http://dive4elements.wald.intevation.org