Mercurial > dive4elements > river
changeset 4164:8d3e8cb54e4c
Add data for the gauge name to the GaugeDischargeCurveArtifact
| author | Björn Ricks <bjoern.ricks@intevation.de> |
|---|---|
| date | Wed, 17 Oct 2012 09:58:24 +0200 |
| parents | 2b4f78ccfbaa |
| children | f54223644814 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties |
| diffstat | 7 files changed, 23 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Oct 17 01:12:19 2012 +0200 +++ b/flys-artifacts/ChangeLog Wed Oct 17 09:58:24 2012 +0200 @@ -1,3 +1,13 @@ +2012-10-17 Björn Ricks <bjoern.ricks@intevation.de> + + * doc/conf/artifacts/gaugedischargecurve.xml, + src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java, + src/main/resources/messages.properties, + src/main/resources/messages_de.properties, + src/main/resources/messages_de_DE.properties, + src/main/resources/messages_en.properties: + Add data for the gauge name to the GaugeDischargeCurveArtifact. + 2012-10-17 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/utils/DoubleUtil.java(explode):
--- a/flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml Wed Oct 17 01:12:19 2012 +0200 +++ b/flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml Wed Oct 17 09:58:24 2012 +0200 @@ -4,6 +4,7 @@ <state id="state.gaugedischargecurve.static" description="state.gaugedischargecurve.static" state="de.intevation.flys.artifacts.states.StaticState"> <data name="river" type="String" /> <data name="reference_gauge" type="Double" /> + <data name="gauge_name" type="String" /> <outputmodes> <outputmode name="discharge_curve" description="output.discharge_curve" type="chart"> <facets>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java Wed Oct 17 01:12:19 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java Wed Oct 17 09:58:24 2012 +0200 @@ -82,6 +82,12 @@ gaugename = gauge.getName(); } + addData("gauge_name", new DefaultStateData("gauge_name", + Resources.getMsg(callmeta, + "facet.gauge_discharge_curve.gauge_name", + "Name of the gauge"), + "String", gaugename)); + String description = Resources.format(callmeta, "facet.gauge_discharge_curve.description", "Discharge curve on gauge",
--- a/flys-artifacts/src/main/resources/messages.properties Wed Oct 17 01:12:19 2012 +0200 +++ b/flys-artifacts/src/main/resources/messages.properties Wed Oct 17 09:58:24 2012 +0200 @@ -234,6 +234,7 @@ facet.gauge_discharge_curve.description = Discharge Curve on river {0} and gauge {1} facet.gauge_discharge_curve.river = Name of the river facet.gauge_discharge_curve.reference_gauge = Gauge official number +facet.gauge_discharge_curve.gauge_name = Name of the gauge chart.beddifference.height.title = Bedheight Difference chart.beddifference.height.xaxis.label = River-Km [km]
--- a/flys-artifacts/src/main/resources/messages_de.properties Wed Oct 17 01:12:19 2012 +0200 +++ b/flys-artifacts/src/main/resources/messages_de.properties Wed Oct 17 09:58:24 2012 +0200 @@ -233,7 +233,8 @@ facet.bedheight.diff.epoch = Sohlh\u00f6hendifferenz {0} facet.gauge_discharge_curve.description = Abflusskurve beim Fluss {0} und Pegel {1} facet.gauge_discharge_curve.river = Gew\u00e4sser -facet.gauge_discharge_curve.reference_gauge = Pegel +facet.gauge_discharge_curve.reference_gauge = Pegelnummer +facet.gauge_discharge_curve.gauge_name = Pegelname chart.beddifference.height.title = Sohlh\u00f6hendifferenz chart.beddifference.height.xaxis.label = Fluss-Km [km]
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties Wed Oct 17 01:12:19 2012 +0200 +++ b/flys-artifacts/src/main/resources/messages_de_DE.properties Wed Oct 17 09:58:24 2012 +0200 @@ -231,7 +231,8 @@ facet.bedheight.diff.epoch = Sohlh\u00f6hendifferenz {0} facet.gauge_discharge_curve.description = Abflusskurve beim Fluss {0} und Pegel {1} facet.gauge_discharge_curve.river = Gew\u00e4sser -facet.gauge_discharge_curve.reference_gauge = Pegel +facet.gauge_discharge_curve.reference_gauge = Pegelnummer +facet.gauge_discharge_curve.gauge_name = Pegelname chart.beddifference.height.title = Sohlh\u00f6hendifferenz chart.beddifference.height.xaxis.label = Fluss-Km [km]
--- a/flys-artifacts/src/main/resources/messages_en.properties Wed Oct 17 01:12:19 2012 +0200 +++ b/flys-artifacts/src/main/resources/messages_en.properties Wed Oct 17 09:58:24 2012 +0200 @@ -236,6 +236,7 @@ facet.gauge_discharge_curve.description = Discharge Curve on river {0} and gauge {1} facet.gauge_discharge_curve.river = Name of the river facet.gauge_discharge_curve.reference_gauge = Gauge official number +facet.gauge_discharge_curve.gauge_name = Name of the gauge chart.beddifference.height.title = Bedheight Difference chart.beddifference.height.xaxis.label = River-Km [km]