Mercurial > dive4elements > river

changeset 7142:8c70767028e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure BedDiffYear diagram and remove old generator
author Andre Heinecke <aheinecke@intevation.de>
date Wed, 25 Sep 2013 12:33:22 +0200
parents afa531aca3de
children 053e39436ba3
files artifacts/doc/conf/generators.xml artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearInfoGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java
diffstat 4 files changed, 45 insertions(+), 159 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/generators.xml	Wed Sep 25 12:23:41 2013 +0200
+++ b/artifacts/doc/conf/generators.xml	Wed Sep 25 12:33:22 2013 +0200
@@ -104,7 +104,6 @@
         <domain-axis key="chart.bedheight_middle.section.xaxis.label" default="km">
             <arg expr="artifact.river"/>
         </domain-axis>
-        <processor class="org.dive4elements.river.exports.process.MiddleBedHeightProcessor" axis="H"/>
         <processor class="org.dive4elements.river.exports.process.DeltaWProcessor" axis="dW"/>
         <processor class="org.dive4elements.river.exports.process.AnnotationProcessor" axis="none"/>
         <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
@@ -112,10 +111,40 @@
         <processor class="org.dive4elements.river.exports.process.WDiffProcessor" axis="D"/>
         <processor class="org.dive4elements.river.exports.process.WOutProcessor" axis="W"/>
         <processor class="org.dive4elements.river.exports.process.QOutProcessor" axis="Q"/>
-        <processor class="org.dive4elements.river.exports.process.BedWidthProcessor" axis="W"/>
+        <processor class="org.dive4elements.river.exports.process.BedWidthProcessor" axis="P"/>
         <processor class="org.dive4elements.river.exports.process.BedDiffYearProcessor" axis="W"/>
-        <processor class="org.dive4elements.river.exports.process.BedDiffHeightYearProcessor" axis="W"/>
+        <processor class="org.dive4elements.river.exports.process.BedDiffHeightYearProcessor" axis="mD"/>
+        <processor class="org.dive4elements.river.exports.process.MiddleBedHeightProcessor" axis="H"/>
     </output-generator>
+    <output-generator
+        names="bed_difference_height_year,bed_difference_height_year_chartinfo"
+        class="org.dive4elements.river.exports.DiagramGenerator"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <axis name="dW"/>
+        <axis name="W"/>
+        <axis name="D"/>
+        <axis name="dM"/>
+        <axis name="Q" include-zero="true"/>
+        <axis name="H"/>
+        <axis name="P"/>
+        <axis name="" type="X"/>
+        <title key="chart.beddifference.height.title" default="Sohlenhöhen Differenz"/>
+        <domain-axis key="chart.beddifference.height.xaxis.label" default="Fluss-Km">
+            <arg expr="artifact.river"/>
+        </domain-axis>
+        <processor class="org.dive4elements.river.exports.process.DeltaWProcessor" axis="dW"/>
+        <processor class="org.dive4elements.river.exports.process.AnnotationProcessor" axis="none"/>
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="W"/>
+        <processor class="org.dive4elements.river.exports.process.AreaProcessor" axis="none"/>
+        <processor class="org.dive4elements.river.exports.process.WDiffProcessor" axis="D"/>
+        <processor class="org.dive4elements.river.exports.process.WOutProcessor" axis="W"/>
+        <processor class="org.dive4elements.river.exports.process.QOutProcessor" axis="Q"/>
+        <processor class="org.dive4elements.river.exports.process.BedWidthProcessor" axis="P"/>
+        <processor class="org.dive4elements.river.exports.process.BedDiffYearProcessor" axis="W"/>
+        <processor class="org.dive4elements.river.exports.process.BedDiffHeightYearProcessor" axis="dM"/>
+        <processor class="org.dive4elements.river.exports.process.MiddleBedHeightProcessor" axis="H"/>
+    </output-generator>
+
 
     <output-generator names="bed_difference_year" class="org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator"/>
     <output-generator names="bed_difference_year_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffYearInfoGenerator"/>
@@ -152,8 +181,6 @@
     <output-generator names="bed_quality_export" class="org.dive4elements.river.exports.minfo.BedQualityExporter"/>
     <output-generator names="bed_difference_epoch" class="org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator"/>
     <output-generator names="bed_difference_epoch_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator"/>
-    <output-generator names="bed_difference_height_year" class="org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator"/>
-    <output-generator names="bed_difference_height_year_chartinfo" class="org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator"/>
     <output-generator names="bedheight_difference_export" class="org.dive4elements.river.exports.minfo.BedDifferenceExporter"/>
     <output-generator names="sq_relation_a" class="org.dive4elements.river.exports.sq.SQRelationGeneratorA"/>
     <output-generator names="sq_relation_b" class="org.dive4elements.river.exports.sq.SQRelationGeneratorB"/>
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java	Wed Sep 25 12:23:41 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
- * Software engineering by Intevation GmbH
- *
- * This file is Free Software under the GNU AGPL (>=v3)
- * and comes with ABSOLUTELY NO WARRANTY! Check out the
- * documentation coming with Dive4Elements River for details.
- */
-
-package org.dive4elements.river.exports.minfo;
-
-import org.apache.log4j.Logger;
-
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
-import org.dive4elements.artifactdatabase.state.Facet;
-import org.dive4elements.river.artifacts.model.FacetTypes;
-import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult;
-import org.dive4elements.river.exports.process.BedDiffHeightYearProcessor;
-import org.dive4elements.river.exports.process.KMIndexProcessor;
-import org.dive4elements.river.exports.process.Processor;
-import org.dive4elements.river.jfree.RiverAnnotation;
-import org.dive4elements.river.themes.ThemeDocument;
-
-
-public class BedDiffHeightYearGenerator
-extends BedDiffBaseGenerator
-implements FacetTypes
-{
-    public enum YAXIS {
-        D(0), dW(1);
-
-        protected int idx;
-
-        private YAXIS(int c) {
-            idx = c;
-        }
-    }
-
-    /** The logger that is used in this generator. */
-    private static Logger logger = Logger.getLogger(BedDiffHeightYearGenerator.class);
-
-    public static final String I18N_CHART_TITLE = "chart.beddifference.height.title";
-    public static final String I18N_XAXIS_LABEL = "chart.beddifference.height.xaxis.label";
-    public static final String I18N_YAXIS_LABEL = "chart.beddifference.height.yaxis.label";
-
-    public static final String I18N_CHART_TITLE_DEFAULT = "Sohlenhöhen Differenz";
-    public static final String I18N_XAXIS_LABEL_DEFAULT = "Fluss-Km";
-    public static final String I18N_YAXIS_LABEL_DEFAULT = "delta S [cm / Jahr]";
-    public static final String I18N_DW_YAXIS_LABEL_DEFAULT  =
-            "delta W [cm]";
-    public static final String I18N_DW_YAXIS_LABEL =
-            "chart.fixings.longitudinalsection.yaxis.label";
-
-    @Override
-    protected YAxisWalker getYAxisWalker() {
-        return new YAxisWalker() {
-
-            @Override
-            public int length() {
-                return YAXIS.values().length;
-            }
-
-            @Override
-            public String getId(int idx) {
-                YAXIS[] yaxes = YAXIS.values();
-                return yaxes[idx].toString();
-            }
-        };
-    }
-
-    @Override
-    public void doOut(ArtifactAndFacet bundle, ThemeDocument attr, boolean visible) {
-        String name = bundle.getFacetName();
-
-        logger.debug("doOut: " + name);
-
-        if (name == null) {
-            logger.error("No facet name for doOut(). No output generated!");
-            return;
-        }
-
-        Facet facet = bundle.getFacet();
-
-        if (facet == null) {
-            return;
-        }
-
-        if (bundle.getData(context) instanceof BedDifferencesResult) {
-            setContextBounds(bundle);
-        }
-
-        Processor processor = new KMIndexProcessor();
-        Processor bdyProcessor = new BedDiffHeightYearProcessor();
-        if (name.equals(LONGITUDINAL_ANNOTATION)) {
-            doAnnotations(
-                (RiverAnnotation) bundle.getData(context),
-                 bundle,
-                 attr,
-                 visible);
-        }
-        else if (processor.canHandle(name)) {
-            processor.doOut(this, bundle, attr, visible, YAXIS.dW.idx);
-        }
-        else if (bdyProcessor.canHandle(name)) {
-            bdyProcessor.doOut(this, bundle, attr, visible, YAXIS.D.idx);
-        }
-        else {
-            logger.warn("Unknown facet name " + name);
-        }
-    }
-
-
-    @Override
-    protected String getDefaultChartTitle() {
-        return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
-    }
-
-    @Override
-    protected String getDefaultXAxisLabel() {
-        return msg(I18N_XAXIS_LABEL,
-            I18N_XAXIS_LABEL_DEFAULT,
-            new Object[] { getRiverName() });
-    }
-
-    @Override
-    protected String getDefaultYAxisLabel(int pos) {
-        if (pos == YAXIS.D.idx) {
-            return msg(I18N_YAXIS_LABEL, I18N_YAXIS_LABEL_DEFAULT);
-        }
-        else if (pos == YAXIS.dW.idx) {
-            return msg(I18N_DW_YAXIS_LABEL, I18N_DW_YAXIS_LABEL_DEFAULT);
-        }
-        return "default";
-    }
-}
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearInfoGenerator.java	Wed Sep 25 12:23:41 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde
- * Software engineering by Intevation GmbH
- *
- * This file is Free Software under the GNU AGPL (>=v3)
- * and comes with ABSOLUTELY NO WARRANTY! Check out the
- * documentation coming with Dive4Elements River for details.
- */
-
-package org.dive4elements.river.exports.minfo;
-
-import org.dive4elements.river.exports.ChartInfoGenerator;
-
-
-public class BedDiffHeightYearInfoGenerator
-extends ChartInfoGenerator
-{
-    public BedDiffHeightYearInfoGenerator() {
-        super (new BedDiffHeightYearGenerator());
-    }
-}
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java	Wed Sep 25 12:23:41 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.java	Wed Sep 25 12:33:22 2013 +0200
@@ -30,6 +30,11 @@
 
     protected static double GAP_TOLERANCE = 0.101d;
 
+    public static final String I18N_AXIS_LABEL =
+        "chart.beddifference.height.yaxis.label";
+    public static final String I18N_AXIS_LABEL_DEFAULT =
+        "delta S [cm / Jahr]";
+
     @Override
     public void doOut(
             DiagramGenerator generator,
@@ -92,5 +97,13 @@
 
         generator.addAxisSeries(series, axidx, visible);
     }
+
+    @Override
+    public String getAxisLabel(DiagramGenerator generator) {
+        return generator.msg(
+                I18N_AXIS_LABEL,
+                I18N_AXIS_LABEL_DEFAULT);
+    }
+
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
http://dive4elements.wald.intevation.org