diff artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java @ 9325:094ed9d1f2ad

Fixed: change of point style of interpolated data did not change in WQ chart of fixanalysis Fixed: change of point style of interpolated data did not change in dWt chart of fixanalysis; also had duplicate legend entries
author gernotbelger
date Fri, 27 Jul 2018 14:33:41 +0200
parents 7c7f73e5e01e
children ef5754ba5573
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java	Fri Jul 27 14:32:14 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java	Fri Jul 27 14:33:41 2018 +0200
@@ -66,8 +66,6 @@
 
     protected List<Marker> valueMarker;
 
-    protected Map<String, String> attributes;
-
     protected boolean domainZeroLineVisible;
 
     private static final Logger log =
@@ -90,7 +88,6 @@
         yBounds = new HashMap<Integer, Bounds>();
         domainMarker = new ArrayList<Marker>();
         valueMarker = new ArrayList<Marker>();
-        attributes = new HashMap<String, String>();
     }
 
     @Override
@@ -120,8 +117,6 @@
         addValueAxisMarker(plot);
         adaptZoom(plot);
 
-        applySeriesAttributes(plot);
-
         consumeAxisSettings(plot);
 
         addAnnotationsToRenderer(plot);
@@ -715,87 +710,6 @@
         valueMarker.clear();
     }
 
-    public void addAttribute(String seriesKey, String name) {
-        attributes.put(seriesKey, name);
-    }
-
-    private LegendItem getLegendItemFor(XYPlot plot, String interSeriesKey) {
-        LegendItemCollection litems = plot.getLegendItems();
-        Iterator<LegendItem> iter = litems.iterator();
-        while(iter.hasNext()) {
-            LegendItem item = iter.next();
-            if(interSeriesKey.startsWith(item.getSeriesKey().toString())) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    protected void applySeriesAttributes(XYPlot plot) {
-        int count  = plot.getDatasetCount();
-        for (int i = 0; i < count; i++) {
-            XYDataset data = plot.getDataset(i);
-            if (data == null) {
-                continue;
-            }
-
-            int seriesCount = data.getSeriesCount();
-            for (int j = 0; j < seriesCount; j++) {
-                StyledTimeSeries series =
-                    (StyledTimeSeries)getSeriesOf(data, j);
-                String key = series.getKey().toString();
-
-                if (attributes.containsKey(key)) {
-                    // Interpolated points are drawn unfilled
-                    if (attributes.get(key).equals("interpolate")) {
-                        XYLineAndShapeRenderer renderer =
-                                series.getStyle().getRenderer();
-                        renderer.setSeriesPaint(
-                            j,
-                            renderer.getSeriesFillPaint(j));
-                        renderer.setSeriesShapesFilled(j, false);
-
-                        LegendItem legendItem = getLegendItemFor(plot, key);
-                        if(legendItem != null) {
-                            LegendItem interLegend = new LegendItem(
-                                    legendItem.getLabel(),
-                                    legendItem.getDescription(),
-                                    legendItem.getToolTipText(),
-                                    legendItem.getURLText(),
-                                    legendItem.isShapeVisible(),
-                                    legendItem.getShape(),
-                                    false, // shapeFilled?
-                                    legendItem.getFillPaint(),
-                                    true,  // shapeOutlineVisible?
-                                    renderer.getSeriesFillPaint(j),
-                                    legendItem.getOutlineStroke(),
-                                    legendItem.isLineVisible(),
-                                    legendItem.getLine(),
-                                    legendItem.getLineStroke(),
-                                    legendItem.getLinePaint()
-                                    );
-                            interLegend.setSeriesKey(series.getKey());
-                            log.debug("applySeriesAttributes: "
-                                + "draw unfilled legend item");
-                            plot.getLegendItems().add(interLegend);
-                        }
-                    }
-                }
-
-                if (attributes.containsKey(key)) {
-                    if(attributes.get(key).equals("outline")) {
-                        XYLineAndShapeRenderer renderer =
-                            series.getStyle().getRenderer();
-                        renderer.setSeriesPaint(
-                            j,
-                            renderer.getSeriesFillPaint(j));
-                        renderer.setDrawOutlines(true);
-                    }
-                }
-            }
-        }
-    }
-
     /** Two Ranges that span a rectangular area. */
     public static class Area {
         protected Range xRange;

http://dive4elements.wald.intevation.org