Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java @ 6438:b9c5bb510b39
FixWQCurveGenerator: Remove second y axis (Q?), reference axis by enums id.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 26 Jun 2013 14:54:48 +0200 |
| parents | ed27a894292a |
| children | 0f997d6397c6 |
comparison
equal
deleted
inserted
replaced
| 6437:0341504e9deb | 6438:b9c5bb510b39 |
|---|---|
| 92 "W [NN + m]"; | 92 "W [NN + m]"; |
| 93 | 93 |
| 94 public static final double EPSILON = 0.001d; | 94 public static final double EPSILON = 0.001d; |
| 95 | 95 |
| 96 public static enum YAXIS { | 96 public static enum YAXIS { |
| 97 W(0), | 97 W(0); |
| 98 Q(1); | |
| 99 public int idx; | 98 public int idx; |
| 100 private YAXIS(int c) { | 99 private YAXIS(int c) { |
| 101 idx = c; | 100 idx = c; |
| 102 } | 101 } |
| 103 } | 102 } |
| 217 dateFormat.format(qwd.getDate()), | 216 dateFormat.format(qwd.getDate()), |
| 218 qwd.getQ(), | 217 qwd.getQ(), |
| 219 qwd.getW()); | 218 qwd.getW()); |
| 220 textAnnos.add(anno); | 219 textAnnos.add(anno); |
| 221 | 220 |
| 222 addAxisSeries(series, 0, visible); | 221 addAxisSeries(series, YAXIS.W.idx, visible); |
| 223 if(visible && ThemeUtil.parseShowPointLabel(doc)) { | 222 if(visible && ThemeUtil.parseShowPointLabel(doc)) { |
| 224 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, doc); | 223 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, doc); |
| 225 flysAnno.setTextAnnotations(textAnnos); | 224 flysAnno.setTextAnnotations(textAnnos); |
| 226 addAnnotations(flysAnno); | 225 addAnnotations(flysAnno); |
| 227 } | 226 } |
| 250 dateFormat.format(qwd.getDate()), | 249 dateFormat.format(qwd.getDate()), |
| 251 qwd.getQ(), | 250 qwd.getQ(), |
| 252 qwd.getW()); | 251 qwd.getW()); |
| 253 textAnnos.add(anno); | 252 textAnnos.add(anno); |
| 254 | 253 |
| 255 addAxisSeries(series, 0, visible); | 254 addAxisSeries(series, YAXIS.W.idx, visible); |
| 256 if(visible && ThemeUtil.parseShowPointLabel(doc)) { | 255 if(visible && ThemeUtil.parseShowPointLabel(doc)) { |
| 257 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, doc); | 256 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, doc); |
| 258 flysAnno.setTextAnnotations(textAnnos); | 257 flysAnno.setTextAnnotations(textAnnos); |
| 259 addAnnotations(flysAnno); | 258 addAnnotations(flysAnno); |
| 260 } | 259 } |
| 315 aaf.getFacetDescription(), | 314 aaf.getFacetDescription(), |
| 316 500, // number of samples | 315 500, // number of samples |
| 317 0.0 , // start | 316 0.0 , // start |
| 318 maxQ); // end | 317 maxQ); // end |
| 319 | 318 |
| 320 addAxisSeries(series, 0, visible); | 319 addAxisSeries(series, YAXIS.W.idx, visible); |
| 321 } | 320 } |
| 322 else { | 321 else { |
| 323 logger.warn("doWQCurveOut: maxQ <= 0"); | 322 logger.warn("doWQCurveOut: maxQ <= 0"); |
| 324 } | 323 } |
| 325 } | 324 } |
| 527 qw.getQ(), | 526 qw.getQ(), |
| 528 qw.getW()); | 527 qw.getW()); |
| 529 textAnnos.add(anno); | 528 textAnnos.add(anno); |
| 530 } | 529 } |
| 531 | 530 |
| 532 addAxisSeries(series, 0, visible); | 531 addAxisSeries(series, YAXIS.W.idx, visible); |
| 533 if (visible && ThemeUtil.parseShowPointLabel(theme)) { | 532 if (visible && ThemeUtil.parseShowPointLabel(theme)) { |
| 534 RiverAnnotation flysAnno = | 533 RiverAnnotation flysAnno = |
| 535 new RiverAnnotation(null, null, null, theme); | 534 new RiverAnnotation(null, null, null, theme); |
| 536 flysAnno.setTextAnnotations(textAnnos); | 535 flysAnno.setTextAnnotations(textAnnos); |
| 537 addAnnotations(flysAnno); | 536 addAnnotations(flysAnno); |