Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.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/FixDeltaWtGenerator.java Tue Oct 23 16:26:48 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java Tue Oct 23 16:26:58 2018 +0200 @@ -166,9 +166,11 @@ boolean visible ) { String name = artifactFacet.getFacetName(); + String facetDescription = artifactFacet.getFacetDescription(); + log.debug("FixDeltaWtGenerator.doOut: " + name); log.debug("Theme description is: " - + artifactFacet.getFacetDescription()); + + facetDescription); this.artifact = (D4EArtifact)artifactFacet.getArtifact(); @@ -176,29 +178,32 @@ if (name.contains(FIX_SECTOR_AVERAGE_DWT)) { doSectorAverageOut( + name, artifactFacet.getData(context), - artifactFacet.getFacetDescription(), + facetDescription, theme, visible); } else if (name.equals(FIX_REFERENCE_EVENTS_DWT)) { doReferenceEventsOut( + name, artifactFacet.getData(context), - artifactFacet.getFacetDescription(), + facetDescription, theme, visible); } else if (name.equals(FIX_ANALYSIS_EVENTS_DWT)) { doAnalysisEventsOut( + name, artifactFacet.getData(context), - artifactFacet.getFacetDescription(), + facetDescription, theme, visible); } else if (name.equals(FIX_DEVIATION_DWT)) { doDeviationOut( artifactFacet.getData(context), - artifactFacet.getFacetDescription(), + facetDescription, theme, visible); } @@ -255,6 +260,7 @@ protected void doSectorAverageOut( + String facetName, Object data, String desc, ThemeDocument theme, @@ -264,7 +270,7 @@ QWDDateRange qwd = (QWDDateRange) data; TimeSeriesCollection tsc = new TimeSeriesCollection(); - TimeSeries series = new StyledTimeSeries(desc, theme); + TimeSeries series = new StyledTimeSeries(facetName, desc, theme); if (qwd == null || qwd.qwd == null || qwd.dateRange == null) { return; @@ -301,6 +307,7 @@ protected void doAnalysisEventsOut( + String facetName, Object data, String desc, ThemeDocument theme, @@ -309,11 +316,12 @@ log.debug("doAnalysisEventsOut: desc = " + desc); QWD qwd = (QWD) data; - doQWDEventsOut(qwd, desc, theme, visible); + doQWDEventsOut(facetName, qwd, desc, theme, visible); } protected void doQWDEventsOut( + String facetName, QWD qwd, String desc, ThemeDocument theme, @@ -336,7 +344,7 @@ final RegularTimePeriod rtp = new FixedMillisecond(time); final double value = qwd.getDeltaW(); - final TimeSeries series = new StyledTimeSeries(label, themeInterpolated, shape); + final TimeSeries series = new StyledTimeSeries(facetName,label, themeInterpolated, shape); series.addOrUpdate(rtp, value); tsc.addSeries(series); @@ -377,6 +385,7 @@ } protected void doReferenceEventsOut( + String facetName, Object data, String desc, ThemeDocument theme, @@ -385,7 +394,7 @@ log.debug("doReferenceEventsOut: desc = " + desc); QWD qwd = (QWD) data; - doQWDEventsOut(qwd, desc, theme, visible); + doQWDEventsOut(facetName, qwd, desc, theme, visible); }