Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java @ 2325:1fcaeced48f2
#485 Fixed broken renaming of chart themes.
flys-artifacts/trunk@4009 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Thu, 09 Feb 2012 15:59:49 +0000 |
parents | e2124ca11adb |
children | e123c5643f23 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Thu Feb 09 15:48:13 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Thu Feb 09 15:59:49 2012 +0000 @@ -115,7 +115,11 @@ doWQOut(artifactFacet.getData(context), facet, attr, visible); } else if (name.equals(STATIC_WQ_ANNOTATIONS)) { - doWQAnnotations(artifactFacet.getData(context), facet, attr, visible); + doWQAnnotations( + artifactFacet.getData(context), + artifactFacet, + attr, + visible); } else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q) || name.equals(MAINVALUES_Q) @@ -123,14 +127,18 @@ || name.equals(MAINVALUES_W) ) { doAnnotations((FLYSAnnotation) - artifactFacet.getData(context), facet, attr, visible); + artifactFacet.getData(context), artifactFacet, attr, visible); } else if (name.equals(STATIC_WKMS_INTERPOL)) { - doWAnnotations(artifactFacet.getData(context), facet, attr, visible); + doWAnnotations( + artifactFacet.getData(context), + artifactFacet, + attr, + visible); } else if (FacetTypes.IS.MANUALPOINTS(name)) { doPoints(artifactFacet.getData(context), - artifactFacet.getFacetDescription(), + artifactFacet, attr, visible, YAXIS.W.idx); } else { @@ -183,21 +191,21 @@ */ protected void doWQAnnotations( Object wqkms, - Facet facet, + ArtifactAndFacet aandf, Document theme, boolean visible ) { List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>(); double [][] data = (double [][]) wqkms; for (int i = 0; i< data[0].length; i++) { - xy.add(new StickyAxisAnnotation(facet.getDescription(), + xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), (float) data[0][i], StickyAxisAnnotation.SimpleAxis.X_AXIS)); - xy.add(new StickyAxisAnnotation(facet.getDescription(), + xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS)); } - doAnnotations(new FLYSAnnotation(facet.getDescription(), xy), - facet, theme, visible); + doAnnotations(new FLYSAnnotation(aandf.getFacetDescription(), xy), + aandf, theme, visible); } @@ -208,19 +216,21 @@ */ protected void doWAnnotations( Object wqkms, - Facet facet, + ArtifactAndFacet aandf, Document theme, boolean visible ) { + Facet facet = aandf.getFacet(); + List<StickyAxisAnnotation> xy = new ArrayList<StickyAxisAnnotation>(); double [][] data = (double [][]) wqkms; for (int i = 0; i< data[0].length; i++) { - xy.add(new StickyAxisAnnotation(facet.getDescription(), + xy.add(new StickyAxisAnnotation(aandf.getFacetDescription(), (float) data[1][i], StickyAxisAnnotation.SimpleAxis.Y_AXIS)); } doAnnotations(new FLYSAnnotation(facet.getDescription(), xy), - facet, theme, visible); + aandf, theme, visible); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :