Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java @ 7081:3c4efd4b2c19 generator-refactoring
Simplyfy / unify "invert axis" logic
- DataUtil now can check if two datasets are in the same direction
- In the case of WKM data a no means that the Water flows Right to Left
- If the water flows from right to left do inversion of diagrams
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 20 Sep 2013 17:36:11 +0200 |
| parents | 253d80af5b7f |
| children | f0731aa7b735 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java Fri Sep 20 17:04:37 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/QOutProcessor.java Fri Sep 20 17:36:11 2013 +0200 @@ -50,7 +50,8 @@ generator.addAxisSeries(series, axisName, visible); - generator.handleLTRWaterFlowInversion(wqkms); + /* Check if the diagram should be inverted*/ + generator.setInverted(wqkms.guessRTLData()); } @Override @@ -70,7 +71,8 @@ generator.addAxisSeries(series, index, visible); - invertAxis(generator, wqkms); + /* Check if the diagram should be inverted*/ + generator.setInverted(wqkms.guessRTLData()); } /** @@ -89,36 +91,5 @@ } return false; } - - /** - * This method determines - taking JFreeCharts auto x value ordering into - * account - if the x axis need to be inverted. Waterlines in these charts - * should decrease. - * - * @param generator the generator to invert the axis or not. - * @param wkms The data object that stores the x and y values used for this - * chart. - */ - public void invertAxis(XYChartGenerator generator, WKms wkms) { - boolean wsUp = wkms.guessWaterIncreasing(); - boolean kmUp = DataUtil.guessWaterIncreasing(wkms.allKms()); - int size = wkms.size(); - boolean inv = ((wsUp && kmUp) || (!wsUp && !kmUp)) && size > 1; - - if (logger.isDebugEnabled()) { - logger.debug("(Wkms)Values : " + size); - if (size > 0) { - logger.debug("Start km: " + wkms.getKm(0)); - logger.debug("End km: " + wkms.getKm(size-1)); - } - logger.debug("wsUp: " + wsUp); - logger.debug("kmUp: " + kmUp); - if (size == 1) { - logger.debug("InvertAxis not inverting because we have just one km"); - } - logger.debug("inv: " + inv); - } - generator.setInverted(inv); - } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :