Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java @ 3081:26119b7b3154
Fixing output generator hacking
flys-artifacts/trunk@4677 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Sun, 17 Jun 2012 20:45:01 +0000 |
parents | 5642a83420f2 |
children | ba7df29264cd |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Fri Jun 15 12:42:13 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Sun Jun 17 20:45:01 2012 +0000 @@ -6,6 +6,7 @@ import de.intevation.flys.artifacts.model.fixings.DateRange; import de.intevation.flys.artifacts.model.fixings.FixFunction; +import de.intevation.flys.artifacts.model.fixings.FixWQCurveFacet; import de.intevation.flys.artifacts.model.fixings.QW; import de.intevation.flys.artifacts.model.fixings.QWD; @@ -95,12 +96,7 @@ QWD[] qwds = (QWD[])aaf.getData(context); if(qwds != null) { - // Draw vertical markers - for(QWD qwd : qwds) { - if (qwd != null) { - addDomainMarker(new ValueMarker(qwd.getQ())); - } - } + // TODO } } @@ -135,13 +131,20 @@ protected void doWQCurveOut(ArtifactAndFacet aaf, Document doc, boolean visible) { logger.debug("doWQCurveOut"); - FixFunction func = (FixFunction)aaf.getData(context); + FixWQCurveFacet facet = (FixWQCurveFacet)aaf.getFacet(); + FixFunction func = (FixFunction)facet.getData( + aaf.getArtifact(), context, getCurrentKmFromRequest()); if (func == null) { + logger.warn("doWQCurveOut: Facet does not contain FixFunction"); return; } + + double maxQ = func.getMaxQ(); + maxQ = Math.min(2000.0, Math.abs(maxQ)); + maxQ += maxQ * 0.05; - if(func.getMaxQ() > 0) { + if(maxQ > 0) { XYSeries series = DatasetUtilities.sampleFunction2DToSeries( new Function2DAdapter(func.getFunction()), 0, // start @@ -151,7 +154,7 @@ addAxisSeries(series, 0, visible); } else { - logger.warn("doWQCurveOut: func.getMaxQ() returns 0"); + logger.warn("doWQCurveOut: maxQ <= 0"); } }