Mercurial > dive4elements > river
changeset 4356:375550eb45b7
ExtremeCompute: Improve naming of facets.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 02 Nov 2012 09:10:34 +0100 |
| parents | d095b4267772 |
| children | 11cf29eb002c |
| files | flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeCompute.java |
| diffstat | 1 files changed, 2 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeCompute.java Fri Nov 02 12:01:32 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeCompute.java Fri Nov 02 09:10:34 2012 +0100 @@ -77,21 +77,10 @@ for (int i = 0; i < wqkms.length; i++) { String name = wqkms[i].getName(); - // Ext.Calc has wqkmsName(i) - String nameW = "WW";//TODO: FLYSUtils.createWspWTitle(artifact, context, name); - String nameQ = "QQ";//FLYSUtils.createWspQTitle(artifact, context, name); - - // Hotfix for theme names. Themes with the same name cause problems - // aggregating chart legend items. - if (i > 0 && name.equals(wqkms[i - 1].getName())) { - nameW += "; Q=" + wqkms[i].get(0, new double[3])[1]; - nameQ += " = " + wqkms[i].get(0, new double[3])[1]; - } - Facet w = new WaterlevelFacet( - i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, id, hash); + i, LONGITUDINAL_W, "W("+name+")", ComputeType.ADVANCE, id, hash); Facet q = new WaterlevelFacet( - i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, id, hash); + i, LONGITUDINAL_Q, name, ComputeType.ADVANCE, id, hash); // TODO add more facets like: // csv, data, pdf wst facet, data facet