Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/process/DischargeProcessor.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 | ebe7dfffacc4 |
| children | 695a5f6599b4 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/DischargeProcessor.java Thu Aug 22 15:38:57 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/DischargeProcessor.java Thu Aug 22 23:31:38 2013 +0200 @@ -13,19 +13,17 @@ import org.apache.log4j.Logger; import org.jfree.data.xy.XYSeries; -import org.w3c.dom.Document; import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.model.FacetTypes; import org.dive4elements.river.artifacts.model.WQKms; import org.dive4elements.river.exports.DischargeCurveGenerator; -import org.dive4elements.river.exports.StyledSeriesBuilder; import org.dive4elements.river.exports.XYChartGenerator; import org.dive4elements.river.jfree.CollisionFreeXYTextAnnotation; import org.dive4elements.river.jfree.RiverAnnotation; import org.dive4elements.river.jfree.StyledXYSeries; -import org.dive4elements.river.utils.ThemeUtil; +import org.dive4elements.river.themes.ThemeDocument; import org.jfree.chart.annotations.XYTextAnnotation; @@ -60,7 +58,7 @@ public void doOut( XYChartGenerator generator, ArtifactAndFacet aandf, - Document theme, + ThemeDocument theme, boolean visible, int index ) { @@ -112,7 +110,7 @@ protected void doWQKmsPointOut(XYChartGenerator generator, WQKms wqkms, ArtifactAndFacet aandf, - Document theme, + ThemeDocument theme, boolean visible, int axidx ) { @@ -127,7 +125,7 @@ if (Math.abs(kms[i] - getKm()) <= KM_EPSILON) { series.add(wqkms.getQ(i), wqkms.getW(i)); generator.addAxisSeries(series, axidx, visible); - if(visible && ThemeUtil.parseShowPointLabel(theme)) { + if(visible && theme.parseShowPointLabel()) { List<XYTextAnnotation> textAnnos = new ArrayList<XYTextAnnotation>(); XYTextAnnotation anno = new CollisionFreeXYTextAnnotation( title,