# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1318230437 0
# Node ID e9475d2ef3435f840e2b681d700724d359674ef0
# Parent  7eb9015489b02223e9886cf150e88f20da17bf9b
Bugfix: #189 Changed the order of a duration curve CSV export.

flys-artifacts/trunk@2911 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 7eb9015489b0 -r e9475d2ef343 flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Fri Oct 07 15:55:38 2011 +0000
+++ b/flys-artifacts/ChangeLog	Mon Oct 10 07:07:17 2011 +0000
@@ -1,3 +1,15 @@
+2011-10-10  Ingo Weinzierl <ingo@intevation.de>
+
+	flys/issue189 (WINFO/Dauerlinie: Sortierung der Berechnungsausgabe nach Dauerzahlen aufsteigend)
+
+	* src/main/java/de/intevation/flys/artifacts/model/WQDay.java: Added a
+	  method that determines if the items (days) in this object are increasing
+	  or not.
+
+	* src/main/java/de/intevation/flys/exports/DurationCurveExporter.java:
+	  Changed the order of the CSV export - the highest day is at the top of
+	  the export; the lowest day is at the bottom.
+
 2011-10-07	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	Worked on flys/issue150 (Diagramm: Anzeige von W bergauf).
diff -r 7eb9015489b0 -r e9475d2ef343 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQDay.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQDay.java	Fri Oct 07 15:55:38 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WQDay.java	Mon Oct 10 07:07:17 2011 +0000
@@ -33,6 +33,15 @@
         days.add(day);
     }
 
+
+    public boolean isIncreasing() {
+        int lo = getDay(0);
+        int hi = getDay(size()-1);
+
+        return lo < hi;
+    }
+
+
     public int getDay(int idx) {
         return days.getQuick(idx);
     }
diff -r 7eb9015489b0 -r e9475d2ef343 flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveExporter.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveExporter.java	Fri Oct 07 15:55:38 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DurationCurveExporter.java	Mon Oct 10 07:07:17 2011 +0000
@@ -97,12 +97,23 @@
         NumberFormat qf  = getQFormatter();
         NumberFormat df  = getDFormatter();
 
-        for (int i = 0; i < size; i ++) {
-            writer.writeNext(new String[] {
-                wf.format(wqday.getW(i)),
-                qf.format(wqday.getQ(i)),
-                df.format(wqday.getDay(i))
-            });
+        if (wqday.isIncreasing()) {
+            for (int i = size-1; i >= 0; i --) {
+                writer.writeNext(new String[] {
+                    wf.format(wqday.getW(i)),
+                    qf.format(wqday.getQ(i)),
+                    df.format(wqday.getDay(i))
+                });
+            }
+        }
+        else {
+            for (int i = 0; i < size; i ++) {
+                writer.writeNext(new String[] {
+                    wf.format(wqday.getW(i)),
+                    qf.format(wqday.getQ(i)),
+                    df.format(wqday.getDay(i))
+                });
+            }
         }
     }