Mercurial > dive4elements > river

changeset 7144:b6595716f5f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename BedWidthProcessor to BedHeightSounding processor. This processor takes bedheight data and extracts the sounding information for the diagram.
author Andre Heinecke <aheinecke@intevation.de>
date Wed, 25 Sep 2013 13:09:45 +0200
parents 053e39436ba3
children 432047ee5b4b
files artifacts/doc/conf/generators.xml artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightSoundingProcessor.java artifacts/src/main/java/org/dive4elements/river/exports/process/BedWidthProcessor.java
diffstat 4 files changed, 121 insertions(+), 121 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/generators.xml	Wed Sep 25 12:36:19 2013 +0200
+++ b/artifacts/doc/conf/generators.xml	Wed Sep 25 13:09:45 2013 +0200
@@ -29,7 +29,7 @@
         <processor class="org.dive4elements.river.exports.process.WOutProcessor" axis="W"/>
         <processor class="org.dive4elements.river.exports.process.WDiffProcessor" axis="D"/>
         <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.BedHeightSoundingProcessor" axis="W"/>
         <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.ManualPointsProcessor" axis="W"/>
@@ -58,7 +58,7 @@
         <processor class="org.dive4elements.river.exports.process.WOutProcessor" axis="W"/>
         <processor class="org.dive4elements.river.exports.process.WDiffProcessor" axis="D"/>
         <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.BedHeightSoundingProcessor" axis="W"/>
         <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.ManualPointsProcessor" axis="W"/>
@@ -86,7 +86,7 @@
         <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.MiddleBedHeightProcessor" axis="H"/>
-        <processor class="org.dive4elements.river.exports.process.BedWidthProcessor" axis="P"/>
+        <processor class="org.dive4elements.river.exports.process.BedHeightSoundingProcessor" axis="P"/>
         <processor class="org.dive4elements.river.exports.process.BedDiffYearProcessor" axis="W"/>
         <processor class="org.dive4elements.river.exports.process.BedDiffHeightYearProcessor" axis="W"/>
     </output-generator>
@@ -112,7 +112,7 @@
         <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.BedHeightSoundingProcessor" axis="P"/>
         <processor class="org.dive4elements.river.exports.process.BedDiffYearProcessor" axis="W"/>
         <processor class="org.dive4elements.river.exports.process.BedDiffHeightYearProcessor" axis="mD"/>
         <processor class="org.dive4elements.river.exports.process.MiddleBedHeightProcessor" axis="H"/>
@@ -140,7 +140,7 @@
         <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.BedHeightSoundingProcessor" 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"/>
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Wed Sep 25 12:36:19 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Wed Sep 25 13:09:45 2013 +0200
@@ -20,7 +20,7 @@
 import org.dive4elements.river.exports.process.Processor;
 import org.dive4elements.river.exports.process.BedDiffHeightYearProcessor;
 import org.dive4elements.river.exports.process.BedDiffYearProcessor;
-import org.dive4elements.river.exports.process.BedWidthProcessor;
+import org.dive4elements.river.exports.process.BedHeightSoundingProcessor;
 import org.dive4elements.river.exports.process.QOutProcessor;
 import org.dive4elements.river.exports.process.WOutProcessor;
 import org.dive4elements.river.exports.process.AnnotationProcessor;
@@ -341,7 +341,7 @@
 
         Processor wProcessor = new WOutProcessor();
         Processor qProcessor = new QOutProcessor();
-        Processor bedp = new BedWidthProcessor();
+        Processor bedp = new BedHeightSoundingProcessor();
         Processor bdyProcessor = new BedDiffYearProcessor();
         Processor bdhyProcessor = new BedDiffHeightYearProcessor();
         Processor annotationProcessor = new AnnotationProcessor();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightSoundingProcessor.java	Wed Sep 25 13:09:45 2013 +0200
@@ -0,0 +1,114 @@
+/* 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.process;
+
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.jfree.data.xy.XYSeries;
+
+import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
+import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.river.artifacts.model.minfo.BedHeightSingle;
+import org.dive4elements.river.exports.XYChartGenerator;
+import org.dive4elements.river.exports.DiagramGenerator;
+import org.dive4elements.river.jfree.StyledXYSeries;
+import org.dive4elements.river.model.BedHeightSingleValue;
+import org.dive4elements.river.themes.ThemeDocument;
+
+public class BedHeightSoundingProcessor extends DefaultProcessor {
+
+    private final static Logger logger =
+            Logger.getLogger(BedHeightSoundingProcessor.class);
+
+    private final static String BEDHEIGHT = "bedheight";
+
+    public static final String I18N_AXIS_LABEL_DEFAULT
+        = "Gepeilte Breite [m]";
+    public static final String I18N_AXIS_LABEL =
+        "chart.bedheight_middle.sounding.yaxis.label";
+
+    @Override
+    public void doOut(
+            DiagramGenerator generator,
+            ArtifactAndFacet bundle,
+            ThemeDocument    theme,
+            boolean          visible) {
+        CallContext context = generator.getCallContext();
+        Object data = bundle.getData(context);
+        XYSeries series = new StyledXYSeries(bundle.getFacetDescription(),
+                theme);
+        if (data instanceof BedHeightSingle) {
+            BedHeightSingle bData = (BedHeightSingle)data;
+            double[] width = bData.getMorphWidths();
+            double[] stations = bData.getStations().toNativeArray();
+
+            logger.debug("doBedheightSingleOut");
+
+            for (int i = 0; i < width.length; i++) {
+                series.add(stations[i], width[i], false);
+            }
+        } else if (data instanceof List<?>) {
+            List<BedHeightSingleValue> bData = (List<BedHeightSingleValue>)data;
+
+            logger.debug("doBedheightSingleValueOut");
+
+            for(BedHeightSingleValue bvalue: bData) {
+                series.add(bvalue.getStation(), bvalue.getSoundingWidth());
+            }
+        }
+        generator.addAxisSeries(series, axisName, visible);
+    }
+
+    @Override
+    public void doOut(
+            XYChartGenerator generator,
+            ArtifactAndFacet bundle,
+            ThemeDocument theme,
+            boolean visible,
+            int index
+    ) {
+        CallContext context = generator.getCallContext();
+        Object data = bundle.getData(context);
+        XYSeries series = new StyledXYSeries(bundle.getFacetDescription(),
+                theme);
+        if (data instanceof BedHeightSingle) {
+            BedHeightSingle bData = (BedHeightSingle)data;
+            double[] width = bData.getMorphWidths();
+            double[] stations = bData.getStations().toNativeArray();
+
+            logger.debug("doBedheightSingleOut");
+
+            for (int i = 0; i < width.length; i++) {
+                series.add(stations[i], width[i], false);
+            }
+        } else if (data instanceof List<?>) {
+            List<BedHeightSingleValue> bData = (List<BedHeightSingleValue>)data;
+
+            logger.debug("doBedheightSingleValueOut");
+
+            for(BedHeightSingleValue bvalue: bData) {
+                series.add(bvalue.getStation(), bvalue.getSoundingWidth());
+            }
+        }
+        generator.addAxisSeries(series, index, visible);
+    }
+
+    @Override
+    public boolean canHandle(String facettype) {
+        return BEDHEIGHT.equals(facettype);
+    }
+
+    @Override
+    public String getAxisLabel(DiagramGenerator generator) {
+        return generator.msg(
+                I18N_AXIS_LABEL,
+                I18N_AXIS_LABEL_DEFAULT);
+    }
+}
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedWidthProcessor.java	Wed Sep 25 12:36:19 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +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.process;
-
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.jfree.data.xy.XYSeries;
-
-import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
-import org.dive4elements.artifacts.CallContext;
-import org.dive4elements.river.artifacts.model.minfo.BedHeightSingle;
-import org.dive4elements.river.exports.XYChartGenerator;
-import org.dive4elements.river.exports.DiagramGenerator;
-import org.dive4elements.river.jfree.StyledXYSeries;
-import org.dive4elements.river.model.BedHeightSingleValue;
-import org.dive4elements.river.themes.ThemeDocument;
-
-public class BedWidthProcessor extends DefaultProcessor {
-
-    private final static Logger logger =
-            Logger.getLogger(BedWidthProcessor.class);
-
-    private final static String BEDHEIGHT = "bedheight";
-
-    public static final String I18N_AXIS_LABEL_DEFAULT
-        = "Gepeilte Breite [m]";
-    public static final String I18N_AXIS_LABEL =
-        "chart.bedheight_middle.sounding.yaxis.label";
-
-    @Override
-    public void doOut(
-            DiagramGenerator generator,
-            ArtifactAndFacet bundle,
-            ThemeDocument    theme,
-            boolean          visible) {
-        CallContext context = generator.getCallContext();
-        Object data = bundle.getData(context);
-        XYSeries series = new StyledXYSeries(bundle.getFacetDescription(),
-                theme);
-        if (data instanceof BedHeightSingle) {
-            BedHeightSingle bData = (BedHeightSingle)data;
-            double[] width = bData.getMorphWidths();
-            double[] stations = bData.getStations().toNativeArray();
-
-            logger.debug("doBedheightSingleOut");
-
-            for (int i = 0; i < width.length; i++) {
-                series.add(stations[i], width[i], false);
-            }
-        } else if (data instanceof List<?>) {
-            List<BedHeightSingleValue> bData = (List<BedHeightSingleValue>)data;
-
-            logger.debug("doBedheightSingleValueOut");
-
-            for(BedHeightSingleValue bvalue: bData) {
-                series.add(bvalue.getStation(), bvalue.getSoundingWidth());
-            }
-        }
-        generator.addAxisSeries(series, axisName, visible);
-    }
-
-    @Override
-    public void doOut(
-            XYChartGenerator generator,
-            ArtifactAndFacet bundle,
-            ThemeDocument theme,
-            boolean visible,
-            int index
-    ) {
-        CallContext context = generator.getCallContext();
-        Object data = bundle.getData(context);
-        XYSeries series = new StyledXYSeries(bundle.getFacetDescription(),
-                theme);
-        if (data instanceof BedHeightSingle) {
-            BedHeightSingle bData = (BedHeightSingle)data;
-            double[] width = bData.getMorphWidths();
-            double[] stations = bData.getStations().toNativeArray();
-
-            logger.debug("doBedheightSingleOut");
-
-            for (int i = 0; i < width.length; i++) {
-                series.add(stations[i], width[i], false);
-            }
-        } else if (data instanceof List<?>) {
-            List<BedHeightSingleValue> bData = (List<BedHeightSingleValue>)data;
-
-            logger.debug("doBedheightSingleValueOut");
-
-            for(BedHeightSingleValue bvalue: bData) {
-                series.add(bvalue.getStation(), bvalue.getSoundingWidth());
-            }
-        }
-        generator.addAxisSeries(series, index, visible);
-    }
-
-    @Override
-    public boolean canHandle(String facettype) {
-        return BEDHEIGHT.equals(facettype);
-    }
-
-    @Override
-    public String getAxisLabel(DiagramGenerator generator) {
-        return generator.msg(
-                I18N_AXIS_LABEL,
-                I18N_AXIS_LABEL_DEFAULT);
-    }
-}
http://dive4elements.wald.intevation.org