Mercurial > dive4elements > river
changeset 8376:5f0bc8b28024
Make derived curve-diagram working with subtitle.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 02 Oct 2014 19:31:09 +0200 |
| parents | 0faa82973f60 |
| children | 64b21db73846 |
| files | artifacts/doc/conf/generators/discharge-diagrams.xml artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties artifacts/src/main/resources/messages_de_DE.properties artifacts/src/main/resources/messages_en.properties |
| diffstat | 5 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/generators/discharge-diagrams.xml Thu Oct 02 19:05:01 2014 +0200 +++ b/artifacts/doc/conf/generators/discharge-diagrams.xml Thu Oct 02 19:31:09 2014 +0200 @@ -46,9 +46,12 @@ <output-generator names="fix_derivate_curve,fix_derivate_curve_chartinfo" class="org.dive4elements.river.exports.DischargeGenerator" - injectors="org.dive4elements.river.exports.injector.PNPInjector" + injectors="org.dive4elements.river.exports.injector.KmFromRequestInjector,org.dive4elements.river.exports.injector.PNPInjector" converter="org.dive4elements.river.exports.DiagramAttributes"> - <title key="chart.fixings.derived.discharge.curve.title" default="chart.fixings.derived.discharge.curve.title"/> + <title key="chart.fixings.derivedcurve.title" default="-"/> + <subtitle key="chart.fix.discharge.curve.subtitle" default="-"> + <arg expr="artifact.river"/> + </subtitle> &discharge-defaults; </output-generator>
--- a/artifacts/src/main/resources/messages.properties Thu Oct 02 19:05:01 2014 +0200 +++ b/artifacts/src/main/resources/messages.properties Thu Oct 02 19:31:09 2014 +0200 @@ -651,7 +651,7 @@ chart.fix.deltawt.yaxis.label=\u0394 W(t) [cm] chart.fix.wq.subtitle=Water: {0}; Period: {1,date,short} to {2,date,short} -chart.fixings.derivedcurve.title = Derived curve at km {0} +chart.fixings.derivedcurve.title = Derived curve chart.fixings.deltawt.title = Differences from fitted curve at km {0} chart.fixings.longitudinalsection.title=Longitudinal section
--- a/artifacts/src/main/resources/messages_de.properties Thu Oct 02 19:05:01 2014 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Thu Oct 02 19:31:09 2014 +0200 @@ -198,7 +198,7 @@ chart.reference.curve.title = Bezugslinie chart.reference.curve.subtitle = {0} -chart.fixings.derivedcurve.title = Ableitungskurve an Kilometer {0} +chart.fixings.derivedcurve.title = Ableitungskurve chart.fixings.deltawt.title = Abweichungen von der Ausgleichskurve an Kilometer {0} chart.fixings.analysis.title = L\u00e4ngsschnitt an Kilometer {0} chart.fixings.wq.title = Fixierungsanalyse an Kilometer {0}
--- a/artifacts/src/main/resources/messages_de_DE.properties Thu Oct 02 19:05:01 2014 +0200 +++ b/artifacts/src/main/resources/messages_de_DE.properties Thu Oct 02 19:31:09 2014 +0200 @@ -203,7 +203,7 @@ chart.reference.curve.y.axis.in.cm = Zielpegel [cm] chart.reference.curve.y.axis.in.m = Zielort(e) [NN + m] -chart.fixings.derivedcurve.title = Ableitungskurve an Kilometer {0} +chart.fixings.derivedcurve.title = Ableitungskurve chart.fixings.analysis.title = L\u00e4ngsschnitt an Kilometer {0} chart.fixings.wq.title = Fixierungsanalyse an Kilometer {0} chart.fixings.wq.yaxis.label = W [{0}]
--- a/artifacts/src/main/resources/messages_en.properties Thu Oct 02 19:05:01 2014 +0200 +++ b/artifacts/src/main/resources/messages_en.properties Thu Oct 02 19:31:09 2014 +0200 @@ -201,7 +201,7 @@ chart.fixings.wq.subtitle=River: {0}; Range: {1,date,short} to {2,date,short}; Reference period: {3,date,short} to {4,date,short} chart.fixings.wq.subtitle1={0,date,short} to {1,date,short} -chart.fixings.derivedcurve.title = Derived curve at km {0} +chart.fixings.derivedcurve.title = Derived curve chart.fixings.deltawt.title = Differences from fitted curve at km {0} chart.fixings.wq.title = Fixings Analysis at km {0} chart.fixings.wq.yaxis.label = W [{0}]