[PATCH 3 of 3] issue1225: Add bedheight/year-difference points with a scale factor,

Wald Commits scm-commit at wald.intevation.org
Mon Aug 19 12:33:17 CEST 2013


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1376909004 -7200
# Node ID 83188afbee832bf6f17e625355d18c02724b6228
# Parent  590d420ed382ffcb02988dd39fc92d3a6341c84b
issue1225: Add bedheight/year-difference points with a scale factor,
adjusted axis label.

diff -r 590d420ed382 -r 83188afbee83 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java	Mon Aug 19 12:42:27 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java	Mon Aug 19 12:43:24 2013 +0200
@@ -57,7 +57,7 @@
 
     public static final String I18N_CHART_TITLE_DEFAULT = "Sohlenhöhen Differenz";
     public static final String I18N_XAXIS_LABEL_DEFAULT = "Fluss-Km";
-    public static final String I18N_YAXIS_LABEL_DEFAULT = "delta S [m]";
+    public static final String I18N_YAXIS_LABEL_DEFAULT = "delta S [cm]";
     public static final String I18N_SECOND_YAXIS_LABEL_DEFAULT = "Breite [m]";
     public static final String I18N_THIRD_YAXIS_LABEL_DEFAULT = "Höhe [m]";
     public static final String I18N_DW_YAXIS_LABEL_DEFAULT  =
diff -r 590d420ed382 -r 83188afbee83 artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java	Mon Aug 19 12:42:27 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffYearProcessor.java	Mon Aug 19 12:43:24 2013 +0200
@@ -80,7 +80,11 @@
             points = data.getHeights2Data();
         }
 
-        StyledSeriesBuilder.addPoints(series, points, false, GAP_TOLERANCE);
+        StyledSeriesBuilder.addPointsFactorY(series,
+            points,
+            false,
+            GAP_TOLERANCE,
+            100d);
 
         generator.addAxisSeries(series, axidx, visible);
     }
diff -r 590d420ed382 -r 83188afbee83 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Mon Aug 19 12:42:27 2013 +0200
+++ b/artifacts/src/main/resources/messages.properties	Mon Aug 19 12:43:24 2013 +0200
@@ -310,7 +310,7 @@
 chart.beddifference.height.yaxis.label = Difference [cm/year]
 chart.beddifference.epoch.title = Bedheight Difference
 chart.beddifference.xaxis.label = {0}-km
-chart.beddifference.yaxis.label.diff = Difference [m]
+chart.beddifference.yaxis.label.diff = Difference [cm]
 chart.beddifference.yaxis.label.height = Absolute Height [{0}]
 chart.beddifference.year.title = Bedheight Difference
 chart.beddifference.yaxis.label.morph = Width [m]
diff -r 590d420ed382 -r 83188afbee83 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Mon Aug 19 12:42:27 2013 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Mon Aug 19 12:43:24 2013 +0200
@@ -310,7 +310,7 @@
 chart.beddifference.height.yaxis.label = Differenz [cm/Jahr]
 chart.beddifference.epoch.title = Sohlh\u00f6hendifferenz
 chart.beddifference.xaxis.label = {0}-km
-chart.beddifference.yaxis.label.diff = Differenz [m]
+chart.beddifference.yaxis.label.diff = Differenz [cm]
 chart.beddifference.yaxis.label.height = Absolute H\u00f6he [m]
 chart.beddifference.year.title = Sohlh\u00f6hendifferenz
 chart.beddifference.yaxis.label.morph = Breite [m]
diff -r 590d420ed382 -r 83188afbee83 artifacts/src/main/resources/messages_de_DE.properties
--- a/artifacts/src/main/resources/messages_de_DE.properties	Mon Aug 19 12:42:27 2013 +0200
+++ b/artifacts/src/main/resources/messages_de_DE.properties	Mon Aug 19 12:43:24 2013 +0200
@@ -308,7 +308,7 @@
 chart.beddifference.height.yaxis.label = Differenz [cm/Jahr]
 chart.beddifference.epoch.title = Sohlh\u00f6hendifferenz
 chart.beddifference.xaxis.label = {0}-km
-chart.beddifference.yaxis.label.diff = Differenz [m]
+chart.beddifference.yaxis.label.diff = Differenz [cm]
 chart.beddifference.yaxis.label.height = Absolute H\u00f6he [{0}]
 chart.beddifference.year.title = Sohlh\u00f6hendifferenz
 chart.beddifference.yaxis.label.morph = Breite [m]
diff -r 590d420ed382 -r 83188afbee83 artifacts/src/main/resources/messages_en.properties
--- a/artifacts/src/main/resources/messages_en.properties	Mon Aug 19 12:42:27 2013 +0200
+++ b/artifacts/src/main/resources/messages_en.properties	Mon Aug 19 12:43:24 2013 +0200
@@ -314,7 +314,7 @@
 chart.beddifference.height.yaxis.label = Difference [cm/year]
 chart.beddifference.epoch.title = Bedheight Difference
 chart.beddifference.xaxis.label = {0}-km
-chart.beddifference.yaxis.label.diff = Difference [m]
+chart.beddifference.yaxis.label.diff = Difference [cm]
 chart.beddifference.yaxis.label.height = Absolute Height [m]
 chart.beddifference.year.title = Bedheight Difference
 chart.beddifference.yaxis.label.morph = Width [m]


More information about the Dive4elements-commits mailing list