Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java @ 9556:9b8e8fc1f408
Use facetName in all processors as themeType for legend aggregation.
author | gernotbelger |
---|---|
date | Tue, 23 Oct 2018 16:26:58 +0200 |
parents | ddcd52d239cd |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java Tue Oct 23 16:26:48 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java Tue Oct 23 16:26:58 2018 +0200 @@ -254,6 +254,7 @@ else if (name.equals(DISCHARGE_CURVE)) { log.debug("diso " + name); doDischargeOut( + aaf.getFacetName(), (WINFOArtifact) aaf.getArtifact(), aaf.getData(context), aaf.getFacetDescription(), @@ -401,7 +402,7 @@ final int size = theme.parsePointWidth(); final Shape shape = FixWQCurveGenerator.getWQDShape(qwd, size); - final XYSeries series = new StyledXYSeries( description, theme, shape ); + final XYSeries series = new StyledXYSeries( bundle.getFacetName(), description, theme, shape ); series.add(q, w, false); @@ -462,12 +463,12 @@ return buffer.toString(); } - private void addPointFromWQKms(WQKms wqkms, + private void addPointFromWQKms(String facetName, WQKms wqkms, String title, ThemeDocument theme, boolean visible ) { - XYSeries series = new StyledXYSeries(title, theme); + XYSeries series = new StyledXYSeries(facetName, title, theme); Double ckm = (Double) getContext().getContextValue(CURRENT_KM); if (wqkms == null || wqkms.getKms().length == 0 || ckm == null) { log.info("addPointFromWQKms: No event data to show."); @@ -505,7 +506,7 @@ ) { log.debug("doEventsOut"); // Find W/Q at km. - addPointFromWQKms((WQKms) aaf.getData(getContext()), + addPointFromWQKms(aaf.getFacetName(),(WQKms) aaf.getData(getContext()), aaf.getFacetDescription(), doc, visible); } @@ -530,6 +531,7 @@ if (maxQ > 0) { StyledXYSeries series = JFreeUtil.sampleFunction2D( + aaf.getFacetName(), func.getFunction(), doc, aaf.getFacetDescription(), @@ -544,6 +546,7 @@ } else { StyledXYSeries series2 = JFreeUtil.sampleFunction2D( + aaf.getFacetName(), func.getFunction(), doc, aaf.getFacetDescription(), @@ -682,8 +685,10 @@ /** * Add series with discharge curve to diagram. + * @param string */ protected void doDischargeOut( + String facetName, WINFOArtifact artifact, Object o, String description, @@ -708,7 +713,7 @@ return; } - XYSeries series = new StyledXYSeries(description, theme); + XYSeries series = new StyledXYSeries(facetName, description, theme); double gaugeDatum = getCurrentGaugeDatum(); @@ -717,7 +722,7 @@ addAxisSeries(series, YAXIS.W.idx, visible); } else { - XYSeries series2 = new StyledXYSeries(description, theme); + XYSeries series2 = new StyledXYSeries(facetName, description, theme); StyledSeriesBuilder.addPointsQW(series2, wqkms); addAxisSeries(series2, YAXIS.W.idx, false); @@ -744,14 +749,14 @@ // be delivered by the facet already (instead of in the Generator). log.debug("FixWQCurveGenerator: doWQOut: WQKms"); - addPointFromWQKms((WQKms)aaf.getData(getContext()), + addPointFromWQKms(aaf.getFacetName(),(WQKms)aaf.getData(getContext()), aaf.getFacetDescription(), theme, visible); } else { log.debug("FixWQCurveGenerator: doWQOut: double[][]"); double [][] data = (double [][]) wqkms; - XYSeries series = new StyledXYSeries( + XYSeries series = new StyledXYSeries(aaf.getFacetName(), aaf.getFacetDescription(), false, true, theme); StyledSeriesBuilder.addPoints(series, data, true); @@ -770,7 +775,7 @@ return; } - XYSeries series = new StyledXYSeries( + XYSeries series = new StyledXYSeries(aaf.getFacetName(), aaf.getFacetDescription(), false, true, theme);