Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java @ 3091:179e38aa678d
Some fixing charts are generated now
flys-artifacts/trunk@4690 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Mon, 18 Jun 2012 13:29:15 +0000 |
parents | 960307cf2adc |
children | 6ea299c208cd |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Mon Jun 18 12:29:29 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Mon Jun 18 13:29:15 2012 +0000 @@ -72,9 +72,6 @@ else if(FIX_ANALYSIS_EVENTS_WQ.equals(name)) { doAnalysisEventsOut(aaf, doc, visible); } - else if(FIX_ANALYSIS_PERIODS_WQ.equals(name)) { - doAnalysisPeriodsOut(aaf, doc, visible); - } else if(FIX_REFERENCE_EVENTS_WQ.equals(name)) { doReferenceEventsOut(aaf, doc, visible); } @@ -90,16 +87,25 @@ } } + /** Add sector average points to chart */ protected void doSectorAverageOut(ArtifactAndFacet aaf, Document doc, boolean visible) { logger.debug("doSectorAverageOut"); QWD[] qwds = (QWD[])aaf.getData(context); if(qwds != null) { - // TODO + XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), doc); + for(QW qw : qwds) { + if(qw != null) { + series.add(qw.getQ(), qw.getW()); + } + } + + addAxisSeries(series, 0, visible); } } + /** Add analysis event points to chart */ protected void doAnalysisEventsOut(ArtifactAndFacet aaf, Document doc, boolean visible) { logger.debug("doAnalysisEventsOut"); @@ -114,16 +120,10 @@ } } - protected void doAnalysisPeriodsOut(ArtifactAndFacet aaf, Document doc, boolean visible) { - logger.debug("doAnalysisPeriodsOut"); - - DateRange[] dateRanges = (DateRange[])aaf.getData(context); - //TODO What to do with Date ranges? - } - + /** Add reference event points to chart */ protected void doReferenceEventsOut(ArtifactAndFacet aaf, Document doc, boolean visible) { logger.debug("doReferenceEventsOut"); - + QW[] qws = (QW[])aaf.getData(context); addQWSeries(qws, aaf, doc, visible); } @@ -141,8 +141,6 @@ } double maxQ = func.getMaxQ(); - maxQ = Math.min(2000.0, Math.abs(maxQ)); - maxQ += maxQ * 0.05; if(maxQ > 0) { XYSeries series = DatasetUtilities.sampleFunction2DToSeries(