Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java @ 6635:3aa6c1f5ddc3
Do not invert chart when adding point data. (issue1290)
If the wkms size == 1 guessWaterIncreasing is always
false in that cases the diagram was inverted.
See issue1290 for rationale.
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Tue, 23 Jul 2013 09:49:11 +0200 |
| parents | af13ceeba52a |
| children | bf76346864fd |
comparison
equal
deleted
inserted
replaced
| 6634:b1e66ea7fc2b | 6635:3aa6c1f5ddc3 |
|---|---|
| 102 * chart. | 102 * chart. |
| 103 */ | 103 */ |
| 104 public void invertAxis(XYChartGenerator generator, WKms wkms) { | 104 public void invertAxis(XYChartGenerator generator, WKms wkms) { |
| 105 boolean wsUp = wkms.guessWaterIncreasing(); | 105 boolean wsUp = wkms.guessWaterIncreasing(); |
| 106 boolean kmUp = DataUtil.guessWaterIncreasing(wkms.allKms()); | 106 boolean kmUp = DataUtil.guessWaterIncreasing(wkms.allKms()); |
| 107 boolean inv = (wsUp && kmUp) || (!wsUp && !kmUp); | |
| 108 | |
| 109 int size = wkms.size(); | 107 int size = wkms.size(); |
| 108 boolean inv = ((wsUp && kmUp) || (!wsUp && !kmUp)) && size > 1; | |
| 110 | 109 |
| 111 if (logger.isDebugEnabled()) { | 110 if (logger.isDebugEnabled()) { |
| 112 logger.debug("(Wkms)Values : " + size); | 111 logger.debug("(Wkms)Values : " + size); |
| 113 if (size > 0) { | 112 if (size > 0) { |
| 114 logger.debug("Start km: " + wkms.getKm(0)); | 113 logger.debug("Start km: " + wkms.getKm(0)); |
| 115 logger.debug("End km: " + wkms.getKm(size-1)); | 114 logger.debug("End km: " + wkms.getKm(size-1)); |
| 116 } | 115 } |
| 117 logger.debug("wsUp: " + wsUp); | 116 logger.debug("wsUp: " + wsUp); |
| 118 logger.debug("kmUp: " + kmUp); | 117 logger.debug("kmUp: " + kmUp); |
| 118 if (size == 1) { | |
| 119 logger.debug("InvertAxis not inverting because we have just one km"); | |
| 120 } | |
| 119 logger.debug("inv: " + inv); | 121 logger.debug("inv: " + inv); |
| 120 } | 122 } |
| 121 generator.setInverted(inv); | 123 generator.setInverted(inv); |
| 122 } | 124 } |
| 123 } | 125 } |