comparison flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java @ 3610:66f539df4e8b

Issue 716. FixA: Spilt reference and analysis period themes into one theme for each event. flys-artifacts/trunk@5239 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Thu, 23 Aug 2012 08:49:37 +0000
parents 6aea625190da
children e727e3ebdf85
comparison
equal deleted inserted replaced
3609:a16837d73130 3610:66f539df4e8b
166 166
167 /** Add analysis event points to chart */ 167 /** Add analysis event points to chart */
168 protected void doAnalysisEventsOut(ArtifactAndFacet aaf, Document doc, boolean visible) { 168 protected void doAnalysisEventsOut(ArtifactAndFacet aaf, Document doc, boolean visible) {
169 logger.debug("doAnalysisEventsOut"); 169 logger.debug("doAnalysisEventsOut");
170 170
171 QWD[] qwds = (QWD[])aaf.getData(context); 171 QWD qwd = (QWD)aaf.getData(context);
172 if(qwds != null) { 172 if(qwd != null) {
173 addQWSeries(qwds, aaf, doc, visible); 173 XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), doc);
174 List<XYTextAnnotation> textAnnos = new ArrayList<XYTextAnnotation>();
175
176 DateFormat dateFormat = DateFormat.getDateInstance(
177 DateFormat.SHORT);
178
179 series.add(qwd.getQ(), qwd.getW());
180
181 XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
182 dateFormat.format(qwd.getDate()),
183 qwd.getQ(),
184 qwd.getW());
185 textAnnos.add(anno);
186
187 addAxisSeries(series, 0, visible);
188 if(visible && ThemeUtil.parseShowPointLabel(doc)) {
189 FLYSAnnotation flysAnno = new FLYSAnnotation(null, null, null, doc);
190 flysAnno.setTextAnnotations(textAnnos);
191 addAnnotations(flysAnno);
192 }
174 } 193 }
175 else { 194 else {
176 logger.debug("doAnalysisEventsOut: qwds == null"); 195 logger.debug("doAnalysisEventsOut: qwds == null");
177 } 196 }
178 } 197 }
179 198
180 /** Add reference event points to chart */ 199 /** Add reference event points to chart */
181 protected void doReferenceEventsOut(ArtifactAndFacet aaf, Document doc, boolean visible) { 200 protected void doReferenceEventsOut(ArtifactAndFacet aaf, Document doc, boolean visible) {
182 logger.debug("doReferenceEventsOut"); 201 logger.debug("doReferenceEventsOut");
183 202
184 QW[] qws = (QW[])aaf.getData(context); 203 QW qwd = (QW)aaf.getData(context);
185 addQWSeries(qws, aaf, doc, visible); 204 if(qwd != null) {
205 XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), doc);
206 List<XYTextAnnotation> textAnnos = new ArrayList<XYTextAnnotation>();
207
208 DateFormat dateFormat = DateFormat.getDateInstance(
209 DateFormat.SHORT);
210
211 series.add(qwd.getQ(), qwd.getW());
212
213 XYTextAnnotation anno = new CollisionFreeXYTextAnnotation(
214 dateFormat.format(qwd.getDate()),
215 qwd.getQ(),
216 qwd.getW());
217 textAnnos.add(anno);
218
219 addAxisSeries(series, 0, visible);
220 if(visible && ThemeUtil.parseShowPointLabel(doc)) {
221 FLYSAnnotation flysAnno = new FLYSAnnotation(null, null, null, doc);
222 flysAnno.setTextAnnotations(textAnnos);
223 addAnnotations(flysAnno);
224 }
225 }
226 else {
227 logger.debug("doAnalysisEventsOut: qwds == null");
228 }
186 } 229 }
187 230
188 protected void doWQCurveOut(ArtifactAndFacet aaf, Document doc, boolean visible) { 231 protected void doWQCurveOut(ArtifactAndFacet aaf, Document doc, boolean visible) {
189 logger.debug("doWQCurveOut"); 232 logger.debug("doWQCurveOut");
190 233

http://dive4elements.wald.intevation.org