[Dive4elements-commits] [PATCH 1 of 2] I1174: Changed label for some themes in fix analysis

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1363949714 -3600
# Node ID 75371c9ef47270b35bbd19599eaa77d62b5a6de7
# Parent  02f6741f80d44cbb82a874f01925ae785d34dc2b
I1174: Changed label for some themes in fix analysis.

diff -r 02f6741f80d4 -r 75371c9ef472 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java	Thu Mar 21 10:49:38 2013 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java	Fri Mar 22 11:55:14 2013 +0100
@@ -62,10 +62,10 @@
     private static final String I18N_REFERENCEPERIOD = "state.fix.analysis.referenceperiod";
 
     public static final String [] SECTOR_LABELS = {
-        "[0 - (MNQ+MQ)/2)",
-        "[(MNQ+MQ)/2 - (MQ+MHQ)/2)",
-        "[(MQ+MHQ)/2 - HQ5)",
-        "[HQ5 - \u221e)"
+        "fix.mnq",
+        "fix.mq",
+        "fix.mhq",
+        "fix.hq5"
     };
 
     // TODO Why does this happen here? In other cases its implemented in the
@@ -180,9 +180,11 @@
                 }
 
                 String sector = SECTOR_LABELS[j];
-                String description = sector + ": " +
-                                     startDate + " - " +
-                                     endDate;
+                String description = "\u0394W (" +
+                    Resources.getMsg(context.getMeta(),
+                        sector,
+                        sector) +
+                        ")";
 
                 int sectorNdx = j - qsS;
                 int facetNdx = i << 2;
@@ -201,7 +203,7 @@
                     new FixLongitudinalAvSectorFacet(
                         facetNdx,
                         FIX_SECTOR_AVERAGE_LS + "_" + sectorNdx,
-                        description));
+                        description + ":" + startDate + " - " + endDate));
                 // TODO: i18n
                 String dev = "Abweichung: " + description;
                 facets.add(
diff -r 02f6741f80d4 -r 75371c9ef472 flys-artifacts/src/main/resources/messages.properties
--- a/flys-artifacts/src/main/resources/messages.properties	Thu Mar 21 10:49:38 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages.properties	Fri Mar 22 11:55:14 2013 +0100
@@ -524,6 +524,10 @@
 fix.vollmer.wq.outliers=Outliers
 fix.vollmer.wq.events=Events
 qsectors=Discharge Sectors
+fix.mnq=arround MNQ
+fix.mq=arraound MQ
+fix.mhq=arround MHQ
+fix.hq5=over HQ5
 
 chart.fix.deltawt.title=Difference from compensating curve at kilometer {0}
 chart.fix.deltawt.subtitle=Water: {0}; Period:  {1,date,short} to {2,date,short}; Reference period: {3,date,short} bis {4,date,short}
diff -r 02f6741f80d4 -r 75371c9ef472 flys-artifacts/src/main/resources/messages_de.properties
--- a/flys-artifacts/src/main/resources/messages_de.properties	Thu Mar 21 10:49:38 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_de.properties	Fri Mar 22 11:55:14 2013 +0100
@@ -514,11 +514,15 @@
 fix.outlier=Ausrei\u00dfer
 fix.analysis=Analyseereignis
 fix.deviation=Standardabweichung
-fix.reference.deviation=Abweichung im Bezugszeitraum
+fix.reference.deviation=Standardabweichung Bezugszeitraum
 fix.vollmer.wq.curve=Angepasste Funktion
 fix.vollmer.wq.outliers=Ausrei\u00dfer
 fix.vollmer.wq.events=Ereignisse
 qsectors=Abfluss-Sektoren
+fix.mnq=um MNQ
+fix.mq=um MQ
+fix.mhq=um MHQ
+fix.hq5=um HQ5
 
 chart.fix.deltawt.title=Abweichungen von der Ausgleichskurve an Kilometer {0}
 chart.fix.deltawt.subtitle=Gew\u00e4sser: {0}; Darstellungszeitraum: {1,date,short} bis {2,date,short}; Bezugszeitraum: {3,date,short} bis {4,date,short}
diff -r 02f6741f80d4 -r 75371c9ef472 flys-artifacts/src/main/resources/messages_de_DE.properties
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties	Thu Mar 21 10:49:38 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_de_DE.properties	Fri Mar 22 11:55:14 2013 +0100
@@ -519,11 +519,15 @@
 fix.outlier=Ausrei\u00dfer
 fix.analysis=Analyseereignis
 fix.deviation=Standardabweichung
-fix.reference.deviation=Abweichung im Bezugszeitraum
+fix.reference.deviation=Standardabweichung Bezugszeitraum
 fix.vollmer.wq.curve=Angepasste Funktion
 fix.vollmer.wq.outliers=Ausrei\u00dfer
 fix.vollmer.wq.events=Ereignisse
 qsectors=Abfluss-Sektoren
+fix.mnq=um MNQ
+fix.mq=um MQ
+fix.mhq=um MHQ
+fix.hq5=um HQ5
 
 chart.fix.deltawt.title=Abweichungen von der Ausgleichskurve an Kilometer {0}
 chart.fix.deltawt.subtitle=Gew\u00e4sser: {0}; Darstellungszeitraum: {1,date,short} bis {2,date,short}; Bezugszeitraum: {3,date,short} bis {4,date,short}
diff -r 02f6741f80d4 -r 75371c9ef472 flys-artifacts/src/main/resources/messages_en.properties
--- a/flys-artifacts/src/main/resources/messages_en.properties	Thu Mar 21 10:49:38 2013 +0100
+++ b/flys-artifacts/src/main/resources/messages_en.properties	Fri Mar 22 11:55:14 2013 +0100
@@ -527,6 +527,10 @@
 fix.vollmer.wq.outliers=Outliers
 fix.vollmer.wq.events=Events
 qsectors=Discharge Sectors
+fix.mnq=arround MNQ
+fix.mq=arraound MQ
+fix.mhq=arround MHQ
+fix.hq5=over HQ5
 
 chart.fix.deltawt.title=Difference from compensating curve at kilometer {0}
 chart.fix.deltawt.subtitle=Water: {0}; Period:  {1,date,short} to {2,date,short}; Reference period: {3,date,short} bis {4,date,short}