Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java @ 6905:1b35b2ddfc28
Artifacts: Introduce ThemeDocument & make stuff compileable again. THIS BREAKS THE SYSTEM! TODO: Move ThemeUtils into ThemeDocument.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Thu, 22 Aug 2013 23:31:38 +0200 |
| parents | d710bd3df387 |
| children | 765cf5fe26c3 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java Thu Aug 22 15:38:57 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java Thu Aug 22 23:31:38 2013 +0200 @@ -23,8 +23,8 @@ import org.dive4elements.river.jfree.StyledXYSeries; import org.dive4elements.river.model.Gauge; import org.dive4elements.river.model.River; +import org.dive4elements.river.themes.ThemeDocument; import org.dive4elements.river.utils.RiverUtils; -import org.dive4elements.river.utils.ThemeUtil; import org.apache.log4j.Logger; import org.jfree.chart.annotations.XYTextAnnotation; @@ -32,7 +32,6 @@ import org.jfree.chart.plot.XYPlot; import org.jfree.data.Range; import org.jfree.data.xy.XYSeries; -import org.w3c.dom.Document; /** @@ -186,7 +185,7 @@ @Override public void doOut( ArtifactAndFacet artifactFacet, - Document theme, + ThemeDocument theme, boolean visible ) { String name = artifactFacet.getFacetName(); @@ -231,7 +230,7 @@ D4EArtifact artifact, Object o, String description, - Document theme, + ThemeDocument theme, boolean visible) { logger.debug("DischargeCurveGenerator.doDischargeOut"); @@ -268,7 +267,7 @@ protected void doQOut( Object wqkms, ArtifactAndFacet aaf, - Document theme, + ThemeDocument theme, boolean visible ) { logger.debug("DischargeCurveGenerator: doQOut (add W/Q data)."); @@ -285,7 +284,7 @@ String title, double x, double y, - Document theme + ThemeDocument theme ) { List<XYTextAnnotation> textAnnos = new ArrayList<XYTextAnnotation>(); @@ -330,7 +329,7 @@ protected void doWQOut( Object wq, ArtifactAndFacet aaf, - Document theme, + ThemeDocument theme, boolean visible ) { logger.debug("DischargeCurveGenerator: doWQOut"); @@ -372,7 +371,7 @@ addAxisSeries(series, YAXIS.W.idx, visible); } - if (visible && ThemeUtil.parseShowPointLabel(theme) + if (visible && theme.parseShowPointLabel() && data != null && data.length != 0) { double[] xs = data[0];