Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java @ 3596:6aea625190da
Handle former W calculations in fixA W/Q out.
flys-artifacts/trunk@5218 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 16 Aug 2012 09:49:21 +0000 |
parents | 0ac28739ee15 |
children | 66f539df4e8b |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Thu Aug 16 09:41:53 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java Thu Aug 16 09:49:21 2012 +0000 @@ -132,7 +132,7 @@ doc, visible); } - else if(STATIC_WQ.equals(name)) { + if (LONGITUDINAL_W.equals(name) || STATIC_WQ.equals(name)) { doWQOut(aaf.getData(context), aaf, doc, visible); } else if (name.equals(DISCHARGE_CURVE)) { @@ -274,7 +274,8 @@ } } - /** + + /** * Add W-Annotations to plot. * @param wqkms actual data (double[][]). * @param theme theme to use. @@ -303,7 +304,8 @@ // Assume its WKms. logger.debug("Got WKms"); WKms data = (WKms) wqkms; - Double ckm = (Double) context.getContextValue("currentKm"); + + Double ckm = (Double) context.getContextValue(CURRENT_KM); double location = (ckm != null) ? ckm.doubleValue() : getRange()[0]; @@ -353,6 +355,7 @@ addAxisSeries(series, YAXIS.W.idx, visible); } + /** * Add WQ Data to plot. * @param wqkms data as double[][] @@ -364,14 +367,27 @@ boolean visible ) { logger.debug("FixWQCurveGenerator: doWQOut"); - double [][] data = (double [][]) wqkms; + if (wqkms instanceof WQKms) { + WQKms data = (WQKms) wqkms; - XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme); - StyledSeriesBuilder.addPoints(series, data, true); + XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme); + Double ckm = (Double) context.getContextValue(CURRENT_KM); - addAxisSeries(series, YAXIS.W.idx, visible); + StyledSeriesBuilder.addPointsQW(series, data); + + addAxisSeries(series, YAXIS.W.idx, visible); + } + else { + double [][] data = (double [][]) wqkms; + + XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme); + StyledSeriesBuilder.addPoints(series, data, true); + + addAxisSeries(series, YAXIS.W.idx, visible); + } } + protected void addQWSeries(QW[] qws, ArtifactAndFacet aaf, Document theme, boolean visible) { if(qws != null) { XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);