comparison flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java @ 1791:e0e5a5b51a40

Added new StyledSeriesBuilder class and use it when adding points to XYSeries (in diagram generation). flys-artifacts/trunk@3114 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 28 Oct 2011 13:39:37 +0000
parents 205eb6f124a5
children a97764363ba2
comparison
equal deleted inserted replaced
1790:d3a0d55dff63 1791:e0e5a5b51a40
341 ) { 341 ) {
342 logger.debug("LongitudinalSectionGenerator.doWOut"); 342 logger.debug("LongitudinalSectionGenerator.doWOut");
343 343
344 XYSeries series = new StyledXYSeries(facet.getDescription(), theme); 344 XYSeries series = new StyledXYSeries(facet.getDescription(), theme);
345 345
346 int size = wkms.size(); 346 StyledSeriesBuilder.addPoints(series, wkms);
347
348 for (int i = 0; i < size; i++) {
349 series.add(wkms.getKm(i), wkms.getW(i), false);
350 }
351 347
352 addFirstAxisSeries(series, visible); 348 addFirstAxisSeries(series, visible);
353 349
354 if (wkms instanceof WQKms) { 350 if (wkms instanceof WQKms) {
355 if (needInvertAxis((WQKms) wkms)) { 351 if (needInvertAxis((WQKms) wkms)) {
372 if (wkms == null) { 368 if (wkms == null) {
373 logger.warn("No data to add to WDifferencesChart."); 369 logger.warn("No data to add to WDifferencesChart.");
374 return; 370 return;
375 } 371 }
376 372
377 int size = wkms.size();
378 XYSeries series = new StyledXYSeries(facet.getDescription(), theme); 373 XYSeries series = new StyledXYSeries(facet.getDescription(), theme);
379 374
380 if (logger.isDebugEnabled()) { 375 if (logger.isDebugEnabled()) {
381 if (wkms.size() > 0) { 376 if (wkms.size() > 0) {
382 logger.debug("Generate series: " + series.getKey()); 377 logger.debug("Generate series: " + series.getKey());
383 logger.debug("Start km: " + wkms.getKm(0)); 378 logger.debug("Start km: " + wkms.getKm(0));
384 logger.debug("End km: " + wkms.getKm(size-1)); 379 logger.debug("End km: " + wkms.getKm(wkms.size() - 1));
385 logger.debug("Values : " + size); 380 logger.debug("Values : " + wkms.size());
386 } 381 }
387 } 382 }
388 383
389 for (int i = 0; i < size; i++) { 384 StyledSeriesBuilder.addPoints(series, wkms);
390 series.add(wkms.getKm(i), wkms.getW(i));
391 }
392 385
393 addSecondAxisSeries(series, visible); 386 addSecondAxisSeries(series, visible);
394 if (DataUtil.guessWaterIncreasing(wkms.allWs())) { 387 if (DataUtil.guessWaterIncreasing(wkms.allWs())) {
395 setInverted(true); 388 setInverted(true);
396 } 389 }
416 ) { 409 ) {
417 logger.debug("LongitudinalSectionGenerator.doQOut"); 410 logger.debug("LongitudinalSectionGenerator.doQOut");
418 411
419 XYSeries series = new StyledXYSeries(facet.getDescription(), theme); 412 XYSeries series = new StyledXYSeries(facet.getDescription(), theme);
420 413
421 int size = wqkms.size(); 414 StyledSeriesBuilder.addPoints(series, wqkms);
422
423 for (int i = 0; i < size; i++) {
424 series.add(wqkms.getKm(i), wqkms.getQ(i), false);
425 }
426 415
427 addSecondAxisSeries(series, visible); 416 addSecondAxisSeries(series, visible);
428 417
429 if (needInvertAxis(wqkms)) { 418 if (needInvertAxis(wqkms)) {
430 setInverted(true); 419 setInverted(true);

http://dive4elements.wald.intevation.org