# HG changeset patch # User Andre Heinecke # Date 1380125014 -7200 # Node ID e7690ed60b4c89295bed63b8dd826eb24213fc05 # Parent fdf2d31b895577811792c68f53cb1bae399bb63f Configure SedimentLoad to use the new diagram Generator diff -r fdf2d31b8955 -r e7690ed60b4c artifacts/doc/conf/generators.xml --- 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 @@ - + @@ -211,6 +211,47 @@ + + + + + + + + + + + + + + + + + + <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"/> diff -r fdf2d31b8955 -r e7690ed60b4c artifacts/src/main/java/org/dive4elements/river/exports/process/SedimentLoadProcessor.java --- 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 @@ } } } - - -