Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java @ 9556:9b8e8fc1f408

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use facetName in all processors as themeType for legend aggregation.
author gernotbelger
date Tue, 23 Oct 2018 16:26:58 +0200
parents d8e753d0fdb9
children
comparison
equal deleted inserted replaced
9555:ef5754ba5573 9556:9b8e8fc1f408
51 ) { 51 ) {
52 log.debug("Processing facet: " + bundle.getFacetName()); 52 log.debug("Processing facet: " + bundle.getFacetName());
53 CallContext context = generator.getContext(); 53 CallContext context = generator.getContext();
54 Object data = bundle.getData(context); 54 Object data = bundle.getData(context);
55 55
56 XYSeries series = new StyledXYSeries( 56 final String facetName = bundle.getFacetName();
57
58 XYSeries series = new StyledXYSeries(facetName,
57 bundle.getFacetDescription(), theme); 59 bundle.getFacetDescription(), theme);
58 60
59 // Handle non WKms data. 61 // Handle non WKms data.
60 if ( 62 if (
61 bundle.getFacetName().equals(FacetTypes.FLOW_VELOCITY_WATERLEVEL) 63 bundle.getFacetName().equals(FacetTypes.FLOW_VELOCITY_WATERLEVEL)
87 generator.addAxisSeries(series, axisName, visible); 89 generator.addAxisSeries(series, axisName, visible);
88 90
89 // If a "band around the curve shall be drawn, add according area. 91 // If a "band around the curve shall be drawn, add according area.
90 double bandWidth = theme.parseBandWidth(); 92 double bandWidth = theme.parseBandWidth();
91 if (bandWidth > 0 ) { 93 if (bandWidth > 0 ) {
92 XYSeries seriesDown = new StyledXYSeries( 94 XYSeries seriesDown = new StyledXYSeries(facetName,
93 "band " + bundle.getFacetDescription(), false, theme); 95 "band " + bundle.getFacetDescription(), false, theme);
94 XYSeries seriesUp = new StyledXYSeries( 96 XYSeries seriesUp = new StyledXYSeries(facetName,
95 bundle.getFacetDescription()+"+/-"+bandWidth, false, theme); 97 bundle.getFacetDescription()+"+/-"+bandWidth, false, theme);
96 StyledSeriesBuilder.addUpperBand(seriesUp, wkms, bandWidth); 98 StyledSeriesBuilder.addUpperBand(seriesUp, wkms, bandWidth);
97 StyledSeriesBuilder.addLowerBand(seriesDown, wkms, bandWidth); 99 StyledSeriesBuilder.addLowerBand(seriesDown, wkms, bandWidth);
98 100
99 StyledAreaSeriesCollection area = 101 StyledAreaSeriesCollection area =
100 new StyledAreaSeriesCollection(theme); 102 new StyledAreaSeriesCollection(facetName,theme);
101 area.addSeries(seriesUp); 103 area.addSeries(seriesUp);
102 area.addSeries(seriesDown); 104 area.addSeries(seriesDown);
103 area.setMode(StyledAreaSeriesCollection.FILL_MODE.BETWEEN); 105 area.setMode(StyledAreaSeriesCollection.FILL_MODE.BETWEEN);
104 generator.addAxisDataset(area, axisName, visible); 106 generator.addAxisDataset(area, axisName, visible);
105 } 107 }
128 { 130 {
129 log.debug("doOut"); 131 log.debug("doOut");
130 132
131 CallContext context = generator.getContext(); 133 CallContext context = generator.getContext();
132 134
133 XYSeries series = new StyledXYSeries( 135 final String facetName = bundle.getFacetName();
136
137 XYSeries series = new StyledXYSeries(facetName,
134 bundle.getFacetDescription(), theme); 138 bundle.getFacetDescription(), theme);
135 139
136 WKms wkms = (WKms) bundle.getData(context); 140 WKms wkms = (WKms) bundle.getData(context);
137 141
138 StyledSeriesBuilder.addPoints(series, wkms); 142 StyledSeriesBuilder.addPoints(series, wkms);
139 generator.addAxisSeries(series, index, visible); 143 generator.addAxisSeries(series, index, visible);
140 144
141 // If a "band around the curve shall be drawn, add according area. 145 // If a "band around the curve shall be drawn, add according area.
142 double bandWidth = theme.parseBandWidth(); 146 double bandWidth = theme.parseBandWidth();
143 if (bandWidth > 0 ) { 147 if (bandWidth > 0 ) {
144 XYSeries seriesDown = new StyledXYSeries( 148 XYSeries seriesDown = new StyledXYSeries(facetName,
145 "band " + bundle.getFacetDescription(), false, theme); 149 "band " + bundle.getFacetDescription(), false, theme);
146 XYSeries seriesUp = new StyledXYSeries( 150 XYSeries seriesUp = new StyledXYSeries(facetName,
147 bundle.getFacetDescription()+"+/-"+bandWidth, false, theme); 151 bundle.getFacetDescription()+"+/-"+bandWidth, false, theme);
148 StyledSeriesBuilder.addUpperBand(seriesUp, wkms, bandWidth); 152 StyledSeriesBuilder.addUpperBand(seriesUp, wkms, bandWidth);
149 StyledSeriesBuilder.addLowerBand(seriesDown, wkms, bandWidth); 153 StyledSeriesBuilder.addLowerBand(seriesDown, wkms, bandWidth);
150 154
151 StyledAreaSeriesCollection area = 155 StyledAreaSeriesCollection area = new StyledAreaSeriesCollection(facetName,theme);
152 new StyledAreaSeriesCollection(theme);
153 area.addSeries(seriesUp); 156 area.addSeries(seriesUp);
154 area.addSeries(seriesDown); 157 area.addSeries(seriesDown);
155 area.setMode(StyledAreaSeriesCollection.FILL_MODE.BETWEEN); 158 area.setMode(StyledAreaSeriesCollection.FILL_MODE.BETWEEN);
156 generator.addAreaSeries(area, index, visible); 159 generator.addAreaSeries(area, index, visible);
157 } 160 }
http://dive4elements.wald.intevation.org