Mercurial > dive4elements > river
changeset 8252:1e30489d0958
Added injectors to config and moved subtitle conf.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 10 Sep 2014 10:01:57 +0200 |
| parents | c7ca9c228314 |
| children | b6d54b946f4c |
| files | artifacts/doc/conf/generators/discharge-diagram-defaults.xml artifacts/doc/conf/generators/discharge-diagrams2.xml |
| diffstat | 2 files changed, 22 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/generators/discharge-diagram-defaults.xml Wed Sep 10 10:01:11 2014 +0200 +++ b/artifacts/doc/conf/generators/discharge-diagram-defaults.xml Wed Sep 10 10:01:57 2014 +0200 @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <discharge-defaults> <axis name="W"/> - <domain-axis key="chart.discharge.xaxis.label" default="Q [m\u00b3/s]"/> - <subtitle key="chart.computed.discharge.curve.subtitle" default="-"> - <arg expr="artifact.river"/> - <arg expr="artifact.ld_locations" type="double"/> - </subtitle> + <domain-axis key="chart.discharge.xaxis.label" default="Q [kubikmeter]"/> <processor class="org.dive4elements.river.exports.process.DischargeProcessor" axis="W"/> <processor class="org.dive4elements.river.exports.process.MiscDischargeProcessor" axis="W"/> <processor class="org.dive4elements.river.exports.process.ComputedDischargeProcessor" axis="W"/>
--- a/artifacts/doc/conf/generators/discharge-diagrams2.xml Wed Sep 10 10:01:11 2014 +0200 +++ b/artifacts/doc/conf/generators/discharge-diagrams2.xml Wed Sep 10 10:01:57 2014 +0200 @@ -3,29 +3,45 @@ <output-generator names="historical_discharge_wq,historical_discharge_wq_chartinfo" class="org.dive4elements.river.exports.DischargeGenerator" - converter="org.dive4elements.river.exports.DiagramAttributes"> + converter="org.dive4elements.river.exports.DiagramAttributes" + injector="org.dive4elements.river.exports.injector.HistoricalDischargeInjector"> <title key="chart.historical.discharge.title" default="chart.historical.discharge.title"/> &discharge-defaults; </output-generator> <output-generator names="computed_discharge_curve_chartinfo,computed_discharge_curve" class="org.dive4elements.river.exports.DischargeGenerator" - converter="org.dive4elements.river.exports.DiagramAttributes"> + converter="org.dive4elements.river.exports.DiagramAttributes" + injector="org.dive4elements.river.exports.injector.ComputedDischargeInjector"> <title key="chart.computed.discharge.curve.title" default="chart.computed.discharge.curve.title"/> + <subtitle key="chart.computed.discharge.curve.subtitle" default="-"> + <arg expr="artifact.river"/> + <arg expr="artifact.ld_locations" type="double"/> + </subtitle> &discharge-defaults; </output-generator> <output-generator names="discharge_curve_chartinfo,discharge_curve" class="org.dive4elements.river.exports.DischargeGenerator" - converter="org.dive4elements.river.exports.DiagramAttributes"> + converter="org.dive4elements.river.exports.DiagramAttributes" + injector="org.dive4elements.river.exports.injector.DischargeInjector"> <title key="chart.discharge.curve.title" default="chart.discharge.curve.title"/> + <subtitle key="chart.computed.discharge.curve.subtitle" default="-"> + <arg expr="artifact.river"/> + <arg expr="artifact.ld_locations" type="double"/> + </subtitle> &discharge-defaults; </output-generator> <output-generator names="fix_wq_curve,fix_wq_curve_chartinfo" class="org.dive4elements.river.exports.DischargeGenerator" - converter="org.dive4elements.river.exports.DiagramAttributes"> - <title key="chart.fixings.discharge.curve.title" default="chart.fixings.discharge.curve.title"/> + converter="org.dive4elements.river.exports.DiagramAttributes" + injector="org.dive4elements.river.exports.injector.FixWQInjector"> + <title key="chart.fixings.discharge.curve.title" default="Fixierungsanalyse W/Q"/> + <subtitle key="chart.computed.discharge.curve.subtitle" default="-"> + <arg expr="artifact.river"/> + <arg expr="artifact.ld_locations" type="double"/> + </subtitle> &discharge-defaults; </output-generator>