Mercurial > dive4elements > river

changeset 8529:4ead7919e709

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(issue1717) Use unified description for y-field in editor for manual points in historical discharge time-diagrams.
author Tom Gottfried <tom@intevation.de>
date Wed, 18 Feb 2015 16:57:58 +0100
parents f7d1a7e66b12
children 4dd6d89ce95e
files gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualDatePointsEditor.java
diffstat 5 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Tue Feb 17 16:17:31 2015 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Wed Feb 18 16:57:58 2015 +0100
@@ -1202,6 +1202,8 @@
 
     String editpoints();
 
+    String manual_date_points_y();
+
     // Manual WaterLine (WSP) Editor.
 
     String addWSPButton();
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Tue Feb 17 16:17:31 2015 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Wed Feb 18 16:57:58 2015 +0100
@@ -658,6 +658,7 @@
 addWSPButton = Add Manual LS
 addWSP = Add Manual LS
 selection = Selection
+manual_date_points_y = Y ([m\u00b3/s]/[cm])
 
 # Reference Curves
 reference_curve = Reference Curve
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Tue Feb 17 16:17:31 2015 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Wed Feb 18 16:57:58 2015 +0100
@@ -658,6 +658,7 @@
 addWSP = Neues WSP Thema anlegen
 addWSPButton = WSP Thema
 selection = Auswahl
+manual_date_points_y = Y ([m\u00b3/s]/[cm])
 
 # Reference Curves
 reference_curve = Bezugslinie
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Tue Feb 17 16:17:31 2015 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Wed Feb 18 16:57:58 2015 +0100
@@ -633,6 +633,7 @@
 addWSP = Add Manual LS
 addWSPButton = Add Manual LS
 selection = Selection
+manual_date_points_y = Y ([m\u00b3/s]/[cm])
 
 # Reference Curves
 reference_curve = Reference Curve
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualDatePointsEditor.java	Tue Feb 17 16:17:31 2015 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ManualDatePointsEditor.java	Wed Feb 18 16:57:58 2015 +0100
@@ -180,9 +180,7 @@
                     xAxis = name.getValue();
                 }
                 else if (yAxis.equals("Y")) {
-                    StringProperty name =
-                        (StringProperty)pg.getPropertyByName("label");
-                    yAxis = name.getValue();
+                    yAxis = MSG.manual_date_points_y();
                 }
             }
         }
http://dive4elements.wald.intevation.org