Mercurial > dive4elements > river

changeset 6639:769d9ec8abac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout changeset 6513:ef3b02034f6a
author Tom Gottfried <tom@intevation.de>
date Sat, 29 Jun 2013 00:15:14 +0200
parents f4872350b50f
children 17398e239c77
files artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixLongitudinalSectionGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java
diffstat 9 files changed, 37 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -42,7 +42,7 @@
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class FlowVelocityGenerator
-extends      LongitudinalSectionGenerator
+extends      XYChartGenerator
 implements   FacetTypes
 {
     public enum YAXIS {
@@ -85,6 +85,9 @@
     public static final String I18N_CHART_SHORT_SUBTITLE =
         "chart.flow_velocity.section.shortsubtitle";
 
+    public static final String I18N_XAXIS_LABEL =
+        "chart.flow_velocity.section.xaxis.label";
+
     public static final String I18N_YAXIS_LABEL =
         "chart.flow_velocity.section.yaxis.label";
 
@@ -96,6 +99,7 @@
     public static final String I18N_4YAXIS_LABEL = "chart.bedquality.yaxis.label.diameter";
 
     public static final String I18N_CHART_TITLE_DEFAULT  = "Geschwindigkeit- und Schubspannung";
+    public static final String I18N_XAXIS_LABEL_DEFAULT  = "km";
     public static final String I18N_YAXIS_LABEL_DEFAULT  = "Geschwindigkeit v [m/s]";
     public static final String I18N_2YAXIS_LABEL_DEFAULT = "Schubspannung Tau [N]";
     public static final String I18N_3YAXIS_LABEL_DEFAULT = "Q [m³/s]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -151,7 +151,7 @@
      * @return the default title for this chart.
      */
     @Override
-    protected String getDefaultChartTitle() {
+    public String getDefaultChartTitle() {
         return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
     }
 
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -31,7 +31,7 @@
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class MiddleBedHeightGenerator
-extends      LongitudinalSectionGenerator
+extends      XYChartGenerator
 implements   FacetTypes
 {
     public enum YAXIS {
@@ -58,10 +58,14 @@
     public static final String I18N_CHART_SHORT_SUBTITLE =
         "chart.bedheight_middle.section.shortsubtitle";
 
+    public static final String I18N_XAXIS_LABEL =
+        "chart.bedheight_middle.section.xaxis.label";
+
     public static final String I18N_YAXIS_LABEL =
         "chart.bedheight_middle.section.yaxis.label";
 
     public static final String I18N_CHART_TITLE_DEFAULT  = "Mittlere Sohlhöhe";
+    public static final String I18N_XAXIS_LABEL_DEFAULT  = "km";
     public static final String I18N_YAXIS_LABEL_DEFAULT  = "mittlere Sohlhöhen [müNN]";
     public static final String I18N_W_YAXIS_LABEL =
         "chart.longitudinal.section.yaxis.label";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixLongitudinalSectionGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixLongitudinalSectionGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -55,7 +55,7 @@
             "Fixierungsanalyse";
 
     public static final String I18N_XAXIS_LABEL_DEFAULT  =
-            "km";
+            "[km]";
 
     public static final String I18N_DW_YAXIS_LABEL_DEFAULT  =
             "delta W [cm]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -18,7 +18,7 @@
 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
 import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
-import org.dive4elements.river.exports.LongitudinalSectionGenerator;
+import org.dive4elements.river.exports.fixings.FixChartGenerator;
 import org.dive4elements.river.exports.process.KMIndexProcessor;
 import org.dive4elements.river.exports.process.Processor;
 import org.dive4elements.river.jfree.Bounds;
@@ -28,7 +28,7 @@
 
 
 public class BedDiffHeightYearGenerator
-extends LongitudinalSectionGenerator
+extends FixChartGenerator
 implements FacetTypes
 {
     public enum YAXIS {
@@ -45,9 +45,11 @@
     private static Logger logger = Logger.getLogger(BedDiffHeightYearGenerator.class);
 
     public static final String I18N_CHART_TITLE = "chart.beddifference.height.title";
+    public static final String I18N_XAXIS_LABEL = "chart.beddifference.height.xaxis.label";
     public static final String I18N_YAXIS_LABEL = "chart.beddifference.height.yaxis.label";
 
     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 [cm / Jahr]";
     public static final String I18N_DW_YAXIS_LABEL_DEFAULT  =
             "delta W [cm]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -20,7 +20,7 @@
 import org.dive4elements.river.artifacts.model.WKms;
 import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochResult;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
-import org.dive4elements.river.exports.LongitudinalSectionGenerator;
+import org.dive4elements.river.exports.fixings.FixChartGenerator;
 import org.dive4elements.river.exports.process.KMIndexProcessor;
 import org.dive4elements.river.exports.process.Processor;
 import org.dive4elements.river.exports.process.WOutProcessor;
@@ -33,7 +33,7 @@
 
 
 public class BedDifferenceEpochGenerator
-extends LongitudinalSectionGenerator
+extends FixChartGenerator
 implements FacetTypes
 {
     public enum YAXIS {
@@ -50,10 +50,12 @@
     private static Logger logger = Logger.getLogger(BedQualityGenerator.class);
 
     public static final String I18N_CHART_TITLE = "chart.beddifference.epoch.title";
+    public static final String I18N_XAXIS_LABEL = "chart.beddifference.xaxis.label";
     public static final String I18N_YAXIS_LABEL = "chart.beddifference.yaxis.label.diff";
     public static final String I18N_SECOND_YAXIS_LABEL = "chart.beddifference.yaxis.label.height";
 
     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_SECOND_YAXIS_LABEL_DEFAULT = "Höhe [m]";
     public static final String I18N_DW_YAXIS_LABEL_DEFAULT  =
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -21,7 +21,7 @@
 import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult;
 import org.dive4elements.river.artifacts.model.minfo.MorphologicWidth;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
-import org.dive4elements.river.exports.LongitudinalSectionGenerator;
+import org.dive4elements.river.exports.fixings.FixChartGenerator;
 import org.dive4elements.river.exports.process.KMIndexProcessor;
 import org.dive4elements.river.exports.process.Processor;
 import org.dive4elements.river.exports.process.WOutProcessor;
@@ -34,7 +34,7 @@
 
 
 public class BedDifferenceYearGenerator
-extends LongitudinalSectionGenerator
+extends FixChartGenerator
 implements FacetTypes
 {
     public enum YAXIS {
@@ -51,11 +51,13 @@
     private static Logger logger = Logger.getLogger(BedDifferenceYearGenerator.class);
 
     public static final String I18N_CHART_TITLE = "chart.beddifference.year.title";
+    public static final String I18N_XAXIS_LABEL = "chart.beddifference.xaxis.label";
     public static final String I18N_YAXIS_LABEL = "chart.beddifference.yaxis.label.diff";
     public static final String I18N_SECOND_YAXIS_LABEL = "chart.beddifference.yaxis.label.morph";
     public static final String I18N_THIRD_YAXIS_LABEL = "chart.beddifference.yaxis.label.heights";
 
     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_SECOND_YAXIS_LABEL_DEFAULT = "Breite [m]";
     public static final String I18N_THIRD_YAXIS_LABEL_DEFAULT = "Höhe [m]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -20,7 +20,7 @@
 import org.dive4elements.river.artifacts.model.minfo.BedParametersResult;
 import org.dive4elements.river.artifacts.model.minfo.BedloadDiameterResult;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
-import org.dive4elements.river.exports.LongitudinalSectionGenerator;
+import org.dive4elements.river.exports.XYChartGenerator;
 import org.dive4elements.river.jfree.RiverAnnotation;
 import org.dive4elements.river.jfree.StyledXYSeries;
 
@@ -30,7 +30,7 @@
  *
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
-public class BedQualityGenerator extends LongitudinalSectionGenerator implements FacetTypes {
+public class BedQualityGenerator extends XYChartGenerator implements FacetTypes {
 
     public enum YAXIS {
         W(0), P(1), D(2);
@@ -46,11 +46,13 @@
     private static Logger logger = Logger.getLogger(BedQualityGenerator.class);
 
     public static final String I18N_CHART_TITLE = "chart.bedquality.title";
+    public static final String I18N_XAXIS_LABEL = "chart.bedquality.xaxis.label";
     public static final String I18N_YAXIS_LABEL = "chart.bedquality.yaxis.label";
     public static final String I18N_SECOND_YAXIS_LABEL = "chart.bedquality.yaxis.label.porosity";
     public static final String I18N_THIRD_YAXIS_LABEL = "chart.bedquality.yaxis.label.diameter";
 
     public static final String I18N_CHART_TITLE_DEFAULT = "Sohlen Längsschnitt";
+    public static final String I18N_XAXIS_LABEL_DEFAULT = "Fluss-Km";
     public static final String I18N_YAXIS_LABEL_DEFAULT = "Durchmesser [mm]";
     public static final String I18N_SECOND_YAXIS_LABEL_DEFAULT = "Porosität [%]";
     public static final String I18N_THIRD_YAXIS_LABEL_DEFAULT = "Dichte [t/m^3]";
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java	Sat Jun 29 00:06:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java	Sat Jun 29 00:15:14 2013 +0200
@@ -28,7 +28,7 @@
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoad;
 import org.dive4elements.river.artifacts.model.minfo.SedimentLoadFraction;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
-import org.dive4elements.river.exports.LongitudinalSectionGenerator;
+import org.dive4elements.river.exports.XYChartGenerator;
 import org.dive4elements.river.jfree.Bounds;
 import org.dive4elements.river.jfree.DoubleBounds;
 import org.dive4elements.river.jfree.RiverAnnotation;
@@ -37,7 +37,7 @@
 
 
 public class SedimentLoadLSGenerator
-extends LongitudinalSectionGenerator
+extends XYChartGenerator
 implements FacetTypes
 {
     public enum YAXIS {
@@ -56,6 +56,7 @@
     private static Logger logger = Logger.getLogger(SedimentLoadLSGenerator.class);
 
     public static final String I18N_CHART_TITLE = "chart.sedimentload.ls.title";
+    public static final String I18N_XAXIS_LABEL = "chart.sedimentload.ls.xaxis.label";
     public static final String I18N_YAXIS_LABEL_1 = "chart.sedimentload.ls.yaxis.label.tpera";
     public static final String I18N_YAXIS_LABEL_2 = "chart.sedimentload.ls.yaxis.label.m3pera";
     public static final String I18N_YAXIS_D_LABEL = "chart.beddifference.yaxis.label.diff";
@@ -66,6 +67,7 @@
 
     public final static String I18N_WDIFF_YAXIS_LABEL_DEFAULT = "m";
     public static final String I18N_CHART_TITLE_DEFAULT = "Sedimentfracht";
+    public static final String I18N_XAXIS_LABEL_DEFAULT = "Fluss-Km";
     public static final String I18N_YAXIS_LABEL_DEFAULT_1 = "[t/a]";
     public static final String I18N_YAXIS_LABEL_DEFAULT_2 = "[m\u00b3/a]";
     public static final String I18N_YAXIS_D_LABEL_DEFAULT = "delta S [m]";
@@ -232,6 +234,11 @@
     }
 
     @Override
+    protected String getDefaultXAxisLabel() {
+        return msg(I18N_XAXIS_LABEL, I18N_XAXIS_LABEL_DEFAULT);
+    }
+
+    @Override
     protected String getDefaultYAxisLabel(int pos) {
         String label = "default";
         if (pos == YAXIS.L.idx) {
http://dive4elements.wald.intevation.org