diff flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java @ 1688:7eb9015489b0

Worked on flys/issue150 flys-artifacts/trunk@2908 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 07 Oct 2011 15:55:38 +0000
parents bdb05dc9b763
children 0053a4529f2f
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java	Fri Oct 07 13:33:10 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java	Fri Oct 07 15:55:38 2011 +0000
@@ -22,7 +22,9 @@
 import de.intevation.flys.artifacts.model.WQKms;
 
 import de.intevation.flys.jfree.FLYSAnnotation;
+
 import de.intevation.flys.utils.FLYSUtils;
+import de.intevation.flys.utils.DataUtil;
 
 
 /**
@@ -238,13 +240,20 @@
 
         int size = wqkms.size();
 
+        boolean wsUp = wqkms.guessWaterIncreasing();
+        boolean kmUp = DataUtil.guessWaterIncreasing(wqkms.allKms());
+        boolean inv  = !(kmUp && !wsUp);
+
         if (logger.isDebugEnabled()) {
-            if (wqkms.size() > 0) {
-                logger.debug("Generate series: " + series.getKey());
+            logger.debug("Generate series: " + series.getKey());
+            logger.debug("Values  : " + size);
+            if (size > 0) {
                 logger.debug("Start km: " + wqkms.getKm(0));
                 logger.debug("End   km: " + wqkms.getKm(size-1));
-                logger.debug("Values  : " + size);
             }
+            logger.debug("wsUp: " + wsUp);
+            logger.debug("kmUp: " + kmUp);
+            logger.debug("inv:  " + inv);
         }
 
         for (int i = 0; i < size; i++) {
@@ -253,7 +262,7 @@
 
         addFirstAxisSeries(series, visible);
 
-        if (wqkms.guessWaterIncreasing()) {
+        if (inv) {
             setInverted(true);
         }
     }
@@ -287,9 +296,9 @@
 
         addSecondAxisSeries(series, visible);
 
-        if (wqkms.guessWaterIncreasing()) {
-            setInverted(true);
-        }
+        //if (wqkms.guessWaterIncreasing()) {
+        //    setInverted(true);
+        //}
     }
 
 

http://dive4elements.wald.intevation.org