Mercurial > dive4elements > river

changeset 7154:e7690ed60b4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Configure SedimentLoad to use the new diagram Generator
author Andre Heinecke <aheinecke@intevation.de>
date Wed, 25 Sep 2013 18:03:34 +0200
parents fdf2d31b8955
children 34b5e7ef2a36
files artifacts/doc/conf/generators.xml artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java
diffstat 2 files changed, 42 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/doc/conf/generators.xml	Wed Sep 25 17:40:43 2013 +0200
+++ b/artifacts/doc/conf/generators.xml	Wed Sep 25 18:03:34 2013 +0200
@@ -197,7 +197,7 @@
         </domain-axis>
         <processor class="org.dive4elements.river.exports.process.DeltaWProcessor" axis="deltaW"/>
         <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.ManualPointsProcessor" axis="Porosity"/>
         <processor class="org.dive4elements.river.exports.process.AreaProcessor" axis="none"/>
         <processor class="org.dive4elements.river.exports.process.WDiffProcessor" axis="diffW"/>
         <processor class="org.dive4elements.river.exports.process.WOutProcessor" axis="W"/>
@@ -211,6 +211,47 @@
         <processor class="org.dive4elements.river.exports.process.BedQualityPorosityProcessor" axis="Porosity"/>
         <processor class="org.dive4elements.river.exports.process.BedQualityDensityProcessor" axis="Density"/>
     </output-generator>
+    <output-generator
+        names="sedimentload_ls,sedimentload_ls_chartinfo"
+        class="org.dive4elements.river.exports.DiagramGenerator"
+        converter="org.dive4elements.river.exports.DiagramAttributes">
+        <axis name="W"/>
+        <axis name="diffW"/>
+        <axis name="deltaW"/>
+        <axis name="diffBed"/>
+        <axis name="diffBed/Y"/>
+        <axis name="Q" include-zero="true"/>
+        <axis name="BedHeight"/>
+        <axis name="SoundingWidth"/>
+        <axis name="Width"/>
+        <axis name="Porosity"/>
+        <axis name="Density"/>
+        <axis name="Diameter"/>
+        <axis name="SedimentLoad"/>
+        <axis name="Velocity"/>
+        <axis name="" type="X"/>
+        <title key="hart.sedimentload.ls.title" default="Sedimentfracht"/>
+        <domain-axis key="chart.sedimentload.ls.xaxis.label" default="Fluss-Km">
+            <arg expr="artifact.river"/>
+        </domain-axis>
+        <processor class="org.dive4elements.river.exports.process.DeltaWProcessor" axis="deltaW"/>
+        <processor class="org.dive4elements.river.exports.process.AnnotationProcessor" axis="none"/>
+        <processor class="org.dive4elements.river.exports.process.ManualPointsProcessor" axis="SedimentLoad"/>
+        <processor class="org.dive4elements.river.exports.process.AreaProcessor" axis="none"/>
+        <processor class="org.dive4elements.river.exports.process.WDiffProcessor" axis="diffW"/>
+        <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.BedHeightSoundingProcessor" axis="SoundingWidth"/>
+        <processor class="org.dive4elements.river.exports.process.BedWidthProcessor" axis="Width"/>
+        <processor class="org.dive4elements.river.exports.process.BedDiffYearProcessor" axis="diffBed"/>
+        <processor class="org.dive4elements.river.exports.process.BedDiffHeightYearProcessor" axis="diffBed/Y"/>
+        <processor class="org.dive4elements.river.exports.process.MiddleBedHeightProcessor" axis="BedHeight"/>
+        <processor class="org.dive4elements.river.exports.process.BedQualityDiameterProcessor" axis="Diameter"/>
+        <processor class="org.dive4elements.river.exports.process.BedQualityPorosityProcessor" axis="Porosity"/>
+        <processor class="org.dive4elements.river.exports.process.BedQualityDensityProcessor" axis="Density"/>
+        <processor class="org.dive4elements.river.exports.process.SedimentLoadProcessor" axis="SedimentLoad"/>
+        <!-- TODO bed difference epoch-->
+    </output-generator>
 
 
     <output-generator names="duration_curve" class="org.dive4elements.river.exports.DurationCurveGenerator"/>
@@ -268,9 +309,7 @@
     <output-generator names="fix_waterlevel_export" class="org.dive4elements.river.exports.WaterlevelExporter"/>
     <output-generator names="fix_vollmer_wq_curve" class="org.dive4elements.river.exports.fixings.FixWQCurveGenerator"/>
     <output-generator names="fix_vollmer_wq_curve_chartinfo" class="org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator"/>
-    <output-generator names="sedimentload_ls" class="org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator"/>
     <output-generator names="sedimentload_ls_export" class="org.dive4elements.river.exports.minfo.SedimentLoadExporter"/>
-    <output-generator names="sedimentload_ls_chartinfo" class="org.dive4elements.river.exports.minfo.SedimentLoadLSInfoGenerator"/>
     <!-- Error report generators. -->
     <output-generator names="discharge_longitudinal_section_report" class="org.dive4elements.river.exports.ReportGenerator"/>
     <output-generator names="waterlevel_report" class="org.dive4elements.river.exports.ReportGenerator"/>
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java	Wed Sep 25 17:40:43 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java	Wed Sep 25 18:03:34 2013 +0200
@@ -93,6 +93,3 @@
         }
     }
 }
-
-
-
http://dive4elements.wald.intevation.org