Mercurial > dive4elements > river
changeset 3908:bd0f5a50e194
Theming and i18n of Delta W/t A1/B facets
flys-artifacts/trunk@5575 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Sun, 23 Sep 2012 15:23:47 +0000 |
parents | 9a2c38fb5f29 |
children | fe70edde0897 |
files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/default-themes.xml flys-artifacts/doc/conf/second-themes.xml flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java |
diffstat | 4 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Sat Sep 22 23:54:28 2012 +0000 +++ b/flys-artifacts/ChangeLog Sun Sep 23 15:23:47 2012 +0000 @@ -1,3 +1,10 @@ +2012-09-23 Christian Lins <christian.lins@intevation.de> + + * doc/conf/second-themes.xml, + doc/conf/default-themes.xml, + src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: + Themes and i18n of Delta W/t's A1/B facets (#876). + 2012-09-23 Christian Lins <christian.lins@intevation.de> * doc/conf/artifacts/fixanalysis.xml,
--- a/flys-artifacts/doc/conf/default-themes.xml Sat Sep 22 23:54:28 2012 +0000 +++ b/flys-artifacts/doc/conf/default-themes.xml Sun Sep 23 15:23:47 2012 +0000 @@ -1468,6 +1468,8 @@ <fields> <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h" /> + <field name="showpointlabel" type="boolean" + display="Punktbeschriftung anzeigen" default="true"/> <field name="showlines" type="boolean" default="false" /> <field name="pointsize" type="int" display="Punktdicke" default="3" />
--- a/flys-artifacts/doc/conf/second-themes.xml Sat Sep 22 23:54:28 2012 +0000 +++ b/flys-artifacts/doc/conf/second-themes.xml Sun Sep 23 15:23:47 2012 +0000 @@ -1479,6 +1479,8 @@ <fields> <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h" /> + <field name="showpointlabel" type="boolean" + display="Punktbeschriftung anzeigen" default="true" /> <field name="showlines" type="boolean" default="false" /> <field name="pointsize" type="int" display="Punktdicke" default="3" />
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Sat Sep 22 23:54:28 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Sun Sep 23 15:23:47 2012 +0000 @@ -1,9 +1,11 @@ package de.intevation.flys.exports.fixings; import java.io.OutputStream; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -355,14 +357,18 @@ return; } + Locale locale = Resources.getLocale(context.getMeta()); + NumberFormat nf = NumberFormat.getInstance(locale); + List<XYTextAnnotation> textAnnos = new ArrayList<XYTextAnnotation>(); Set<Map.Entry<Integer, int[]>> entries = annoIdxMap.entrySet(); for(Map.Entry<Integer, int[]> entry : entries) { int[] idxs = entry.getValue(); double x = tsc.getXValue(idxs[0], idxs[1]); + XYTextAnnotation anno = new CollisionFreeXYTextAnnotation( - qwd.getQ() + " m\u00B3/s", + nf.format(qwd.getQ()) + " m\u00B3/s", x, qwd.getDeltaW()); textAnnos.add(anno);