# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1375976204 -7200
# Node ID bdbe704dd433bc4ee9c50acfa704b30fbc2c1ebd
# Parent  962f6b805b48db22a14c3b227ef447bfed32dcc1# Parent  70b440dc53170d804e8f892be43f8ef45421b8d9
merged changes from default into longitudinal-symmetry branch

diff -r 70b440dc5317 -r bdbe704dd433 artifacts/doc/conf/artifacts/minfo.xml
--- a/artifacts/doc/conf/artifacts/minfo.xml	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/doc/conf/artifacts/minfo.xml	Thu Aug 08 17:36:44 2013 +0200
@@ -142,7 +142,7 @@
 
         <state id="state.minfo.flow_velocity" description="state.minfo.flow_velocity" state="org.dive4elements.river.artifacts.states.FlowVelocityState" helpText="help.state.minfo.flow_velocity">
             <outputmodes>
-                <outputmode name="flow_velocity" description="output.flow_velocity" mime-type="image/png" type="chart">
+                <outputmode name="flow_velocity_longitudinal_section" description="output.flow_velocity" mime-type="image/png" type="chart">
                     <facets>
                         <facet name="flow_velocity.totalchannel" description="A facet for total channels"/>
                         <facet name="flow_velocity.mainchannel" description="A facet for main channels"/>
@@ -172,7 +172,7 @@
 
         <state id="state.minfo.bedheight_middle" description="state.minfo.bedheight_middle" state="org.dive4elements.river.artifacts.states.MiddleBedHeight" helpText="help.state.minfo.bedheight_middle">
             <outputmodes>
-                <outputmode name="bedheight_middle" description="output.bedheight_middle" mime-type="image/png" type="chart">
+                <outputmode name="bedheight_middle_longitudinal_section" description="output.bedheight_middle" mime-type="image/png" type="chart">
                     <facets>
                         <facet name="bedheight_middle.single" description="A facet for total channels"/>
                         <facet name="bedheight_middle.epoch" description="A facet for total channels"/>
@@ -205,7 +205,7 @@
 
         <state id="state.minfo.bed.differences" description="state.minfo.bed.differences" state="org.dive4elements.river.artifacts.states.minfo.DifferencesState" helpText="help.state.minfo.bed.differences">
             <outputmodes>
-                <outputmode name="bed_difference_height_year" description="output.absolute_height" mime-type="image/png" type="chart">
+                <outputmode name="bed_difference_height_year_longitudinal_section" description="output.absolute_height" mime-type="image/png" type="chart">
                     <facets>
                         <facet name="bedheight_difference.height_year" description="A facet for absolute heights"/>
                         <facet name="bedheight_difference.height_year.filtered" description="A facet for absolute heights"/>
@@ -219,7 +219,7 @@
                         <facet name="fix_reference_events_ls" description="Datacage facet"/>
                     </facets>
                 </outputmode>
-                <outputmode name="bed_difference_year" description="output.difference_year" mime-type="img/png" type="chart">
+                <outputmode name="bed_difference_year_longitudinal_section" description="output.difference_year" mime-type="img/png" type="chart">
                     <facets>
                         <facet name="bedheight_difference.year" description="A facet for bed height differences"/>
                         <facet name="bedheight_difference.year.filtered" description="A facet for bed height differences"/>
@@ -250,7 +250,7 @@
                         <facet name="morph-width" description="morphologic width, not sounding width!"/>
                     </facets>
                 </outputmode>
-                <outputmode name="bed_difference_epoch" description="output.difference_epoch" mime-type="img/png" type="chart">
+                <outputmode name="bed_difference_epoch_longitudinal_section" description="output.difference_epoch" mime-type="img/png" type="chart">
                     <facets>
                         <facet name="bedheight_difference.epoch" description="A facet for bed height differences"/>
                         <facet name="bed_difference_epoch.manualpoints" />
@@ -499,7 +499,7 @@
 
         <state id="state.minfo.sediment.load.calculate" description="state.minfo.sediment.load.calculate" state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadCalculate">
             <outputmodes>
-                <outputmode name="sedimentload_ls" description="output.sedimentload.ls" mime-type="image/png" type="chart">
+                <outputmode name="sedimentload_longitudinal_section" description="output.sedimentload.ls" mime-type="image/png" type="chart">
                     <facets>
                         <facet name="sedimentload.coarse"/>
                         <facet name="sedimentload.sand"/>
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/doc/conf/artifacts/winfo.xml
--- a/artifacts/doc/conf/artifacts/winfo.xml	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/doc/conf/artifacts/winfo.xml	Thu Aug 08 17:36:44 2013 +0200
@@ -259,7 +259,7 @@
         <state id="state.winfo.w_differences" description="state.winfo.w_differences" state="org.dive4elements.river.artifacts.states.WDifferencesState" helpText="help.state.winfo.w_differences">
 
             <outputmodes>
-                <outputmode name="w_differences" description="output.w_differences" mime-type="image/png" type="chart">
+                <outputmode name="w_differences_longitudinal_section" description="output.w_differences" mime-type="image/png" type="chart">
                     <facets>
                         <facet name="longitudinal_section.q" description="facet.longitudinal_section.q"/>
                         <facet name="longitudinal_section.w" description="facet.longitudinal_section.w"/>
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/doc/conf/conf.xml
--- a/artifacts/doc/conf/conf.xml	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/doc/conf/conf.xml	Thu Aug 08 17:36:44 2013 +0200
@@ -306,7 +306,7 @@
         <output-generator name="durationcurve_export">org.dive4elements.river.exports.DurationCurveExporter</output-generator>
         <output-generator name="computed_dischargecurve_export">org.dive4elements.river.exports.ComputedDischargeCurveExporter</output-generator>
         <output-generator name="discharge_longitudinal_section_export">org.dive4elements.river.exports.DischargeLongitudinalSectionExporter</output-generator>
-        <output-generator name="w_differences">org.dive4elements.river.exports.WDifferencesCurveGenerator</output-generator>
+        <output-generator name="w_differences_longitudinal_section">org.dive4elements.river.exports.WDifferencesCurveGenerator</output-generator>
         <output-generator name="w_differences_chartinfo">org.dive4elements.river.exports.WDifferencesCurveInfoGenerator</output-generator>
         <output-generator name="w_differences_export">org.dive4elements.river.exports.WDifferencesExporter</output-generator>
         <output-generator name="floodmap">org.dive4elements.river.exports.MapGenerator</output-generator>
@@ -321,20 +321,20 @@
         <output-generator name="historical_discharge_wq">org.dive4elements.river.exports.HistoricalDischargeWQCurveGenerator</output-generator>
         <output-generator name="historical_discharge_wq_chartinfo">org.dive4elements.river.exports.HistoricalDischargeWQCurveInfoGenerator</output-generator>
         <output-generator name="historical_discharge_export">org.dive4elements.river.exports.HistoricalDischargeCurveExporter</output-generator>
-        <output-generator name="flow_velocity">org.dive4elements.river.exports.FlowVelocityGenerator</output-generator>
+        <output-generator name="flow_velocity_longitudinal_section">org.dive4elements.river.exports.FlowVelocityGenerator</output-generator>
         <output-generator name="flow_velocity_chartinfo">org.dive4elements.river.exports.FlowVelocityInfoGenerator</output-generator>
         <output-generator name="flow_velocity_export">org.dive4elements.river.exports.FlowVelocityExporter</output-generator>
-        <output-generator name="bedheight_middle">org.dive4elements.river.exports.MiddleBedHeightGenerator</output-generator>
+        <output-generator name="bedheight_middle_longitudinal_section">org.dive4elements.river.exports.MiddleBedHeightGenerator</output-generator>
         <output-generator name="bedheight_middle_chartinfo">org.dive4elements.river.exports.MiddleBedHeightInfoGenerator</output-generator>
         <output-generator name="bedheight_middle_export">org.dive4elements.river.exports.MiddleBedHeightExporter</output-generator>
         <output-generator name="bed_longitudinal_section">org.dive4elements.river.exports.minfo.BedQualityGenerator</output-generator>
         <output-generator name="bed_longitudinal_section_chartinfo">org.dive4elements.river.exports.minfo.BedQualityInfoGenerator</output-generator>
         <output-generator name="bed_quality_export">org.dive4elements.river.exports.minfo.BedQualityExporter</output-generator>
-        <output-generator name="bed_difference_year">org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator</output-generator>
+        <output-generator name="bed_difference_year_longitudinal_section">org.dive4elements.river.exports.minfo.BedDifferenceYearGenerator</output-generator>
         <output-generator name="bed_difference_year_chartinfo">org.dive4elements.river.exports.minfo.BedDiffYearInfoGenerator</output-generator>
-        <output-generator name="bed_difference_epoch">org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator</output-generator>
+        <output-generator name="bed_difference_epoch_longitudinal_section">org.dive4elements.river.exports.minfo.BedDifferenceEpochGenerator</output-generator>
         <output-generator name="bed_difference_epoch_chartinfo">org.dive4elements.river.exports.minfo.BedDiffEpochInfoGenerator</output-generator>
-        <output-generator name="bed_difference_height_year">org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator</output-generator>
+        <output-generator name="bed_difference_height_year_longitudinal_section">org.dive4elements.river.exports.minfo.BedDiffHeightYearGenerator</output-generator>
         <output-generator name="bed_difference_height_year_chartinfo">org.dive4elements.river.exports.minfo.BedDiffHeightYearInfoGenerator</output-generator>
         <output-generator name="bedheight_difference_export">org.dive4elements.river.exports.minfo.BedDifferenceExporter</output-generator>
         <output-generator name="sq_relation_a">org.dive4elements.river.exports.sq.SQRelationGeneratorA</output-generator>
@@ -362,8 +362,7 @@
         <output-generator name="fix_waterlevel_export">org.dive4elements.river.exports.WaterlevelExporter</output-generator>
         <output-generator name="fix_vollmer_wq_curve">org.dive4elements.river.exports.fixings.FixWQCurveGenerator</output-generator>
         <output-generator name="fix_vollmer_wq_curve_chartinfo">org.dive4elements.river.exports.fixings.FixWQCurveInfoGenerator</output-generator>
-        <output-generator name="sedimentload_ls">org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator</output-generator>
-        <output-generator name="sedimentload_ls_export">org.dive4elements.river.exports.minfo.SedimentLoadExporter</output-generator>
+        <output-generator name="sedimentload_longitudinal_section">org.dive4elements.river.exports.minfo.SedimentLoadLSGenerator</output-generator>
         <output-generator name="sedimentload_ls_chartinfo">org.dive4elements.river.exports.minfo.SedimentLoadLSInfoGenerator</output-generator>
         <!-- Error report generators. -->
         <output-generator name="discharge_longitudinal_section_report">org.dive4elements.river.exports.ReportGenerator</output-generator>
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/doc/conf/meta-data.xml	Thu Aug 08 17:36:44 2013 +0200
@@ -47,10 +47,7 @@
               <dc:iterate var="out" container="artifact-outs">
                 <dc:message>Rec out iteration for: {$out}</dc:message>
                 <dc:choose>
-                  <dc:when test="$out = 'w_differences'">
-                    <dc:call-macro name="annotations"/>
-                  </dc:when>
-                  <dc:when test="$out = 'discharge_longitudinal_section'">
+                  <dc:when test="dc:contains($out, 'longitudinal_section')">
                     <dc:call-macro name="annotations"/>
                     <dc:call-macro name="officiallines_user"/>
                   </dc:when>
@@ -116,9 +113,6 @@
                       <dc:call-macro name="bed-heights-epoch"/>
                     </bedheights>
                   </dc:when>
-                  <dc:when test="$out = 'sedimentload_ls'">
-                    <dc:call-macro name="annotations"/>
-                  </dc:when>
                 </dc:choose>
               </dc:iterate>
             </dc:when>
@@ -142,7 +136,7 @@
                   <dc:when test="$out = 'longitudinal_section'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                   </dc:when>
-                  <dc:when test="$out = 'w_differences'">
+                  <dc:when test="$out = 'w_differences_longitudinal_section'">
                     <dc:call-macro name="longitudinal-section-prototype"/>
                     <dc:call-macro name="bedheight_differences"/>
                   </dc:when>
@@ -203,18 +197,18 @@
                   <dc:when test="$out = 'map'">
                     <dc:call-macro name="flood-map-complete"/>
                   </dc:when>
-                  <dc:when test="$out = 'flow_velocity'">
+                  <dc:when test="$out = 'flow_velocity_longitudinal_section'">
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="flow_velocity_measurements"/>
                   </dc:when>
                   <dc:when test="$out = 'bed_longitudinal_section'">
                     <dc:call-macro name="annotations_per_type"/>
                   </dc:when>
-                  <dc:when test="$out = 'sedimentload_ls'">
+                  <dc:when test="$out = 'sedimentload_longitudinal_section'">
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="morph_width"/>
                   </dc:when>
-                  <dc:when test="$out = 'bedheight_middle'">
+                  <dc:when test="$out = 'bedheight_middle_longitudinal_section'">
                     <dc:call-macro name="sounding-width"/>
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
@@ -222,7 +216,7 @@
                     <dc:call-macro name="basedata_3_officials"/>
                     <dc:call-macro name="annotations_per_type"/>
                   </dc:when>
-                  <dc:when test="$out = 'bed_difference_height_year'">
+                  <dc:when test="$out = 'bed_difference_height_year_longitudinal_section'">
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
@@ -231,7 +225,7 @@
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="morph_width"/>
                   </dc:when>
-                  <dc:when test="$out = 'bed_difference_year'">
+                  <dc:when test="$out = 'bed_difference_year_longitudinal_section'">
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
@@ -240,7 +234,7 @@
                     <dc:call-macro name="annotations_per_type"/>
                     <dc:call-macro name="morph_width"/>
                   </dc:when>
-                  <dc:when test="$out = 'bed_difference_epoch'">
+                  <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'">
                     <dc:call-macro name="basedata_0"/>
                     <dc:call-macro name="basedata_1_additionals"/>
                     <dc:call-macro name="basedata_2_fixations"/>
@@ -359,7 +353,7 @@
                       <dc:call-macro name="longitudinal"/>
                       <dc:call-macro name="differences"/>
                     </dc:when>
-                    <dc:when test="$out = 'w_differences'">
+                    <dc:when test="$out = 'w_differences_longitudinal_section'">
                       <dc:call-macro name="longitudinal"/>
                       <dc:call-macro name="differences"/>
                       <dc:call-macro name="bedheight_differences"/>
@@ -399,7 +393,7 @@
                     <dc:when test="$out = 'map'">
                       <dc:call-macro name="flood-map"/>
                     </dc:when>
-                    <dc:when test="$out = 'bedheight_middle'">
+                    <dc:when test="$out = 'bedheight_middle_longitudinal_section'">
                       <dc:call-macro name="waterlevels-discharge"/>
                       <dc:call-macro name="differenceable-fix"/>
                       <dc:call-macro name="differences"/>
@@ -407,7 +401,7 @@
                     <dc:when test="$out = 'floodmap-hws'">
                       <dc:call-macro name="floodmap-hws-user"/>
                     </dc:when>
-                    <dc:when test="$out = 'flow_velocity'">
+                    <dc:when test="$out = 'flow_velocity_longitudinal_section'">
                       <dc:call-macro name="bedquality-bed"/>
                       <dc:call-macro name="bedquality-load"/>
                     </dc:when>
@@ -417,20 +411,20 @@
                       <dc:call-macro name="bedquality-density"/>
                       <dc:call-macro name="bedquality-porosity"/>
                     </dc:when>
-                    <dc:when test="$out = 'sedimentload_ls'">
+                    <dc:when test="$out = 'sedimentload_longitudinal_section'">
                       <dc:call-macro name="differences"/>
                       <dc:call-macro name="bedheight_differences"/>
                       <dc:call-macro name="flow-velocity"/>
                       <dc:call-macro name="sediment-load"/>
                     </dc:when>
-                    <dc:when test="$out = 'bed_difference_year'">
+                    <dc:when test="$out = 'bed_difference_year_longitudinal_section'">
                       <dc:call-macro name="waterlevels-discharge"/>
                       <dc:call-macro name="bedheight_differences"/>
                       <dc:call-macro name="differences"/>
                       <dc:call-macro name="waterlevels-fix"/>
                       <dc:call-macro name="delta-wt-ls"/>
                     </dc:when>
-                    <dc:when test="$out = 'bed_difference_epoch'">
+                    <dc:when test="$out = 'bed_difference_epoch_longitudinal_section'">
                       <dc:call-macro name="waterlevels-discharge"/>
                       <dc:call-macro name="bedheight_differences"/>
                       <dc:call-macro name="differences"/>
@@ -459,7 +453,7 @@
                 target_out="{$out}"
                 artifact-id="{$a_gid}"
                 ids="{$facet_num}"
-                out="w_differences"/>
+                out="w_differences_longitudinal_section"/>
             </dc:for-each>
           </differences>
         </dc:if>
@@ -962,7 +956,7 @@
     </dc:macro>
 
     <dc:macro name="flow-velocity">
-      <dc:filter expr="$out_name = 'flow_velocity' and
+      <dc:filter expr="$out_name = 'flow_velocity_longitudinal_section' and
         ($facet_name = 'flow_velocity.totalchannel' or
          $facet_name = 'flow_velocity.mainchannel' or
          $facet_name = 'flow_velocity.totalchannel.filtered' or
@@ -978,7 +972,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
-                    <dc:attribute name="out" value="flow_velocity"/>
+                    <dc:attribute name="out" value="flow_velocity_longitudinal_section"/>
                   </dc:element>
                 </dc:for-each>
               </flow>
@@ -989,7 +983,7 @@
     </dc:macro>
 
     <dc:macro name="sediment-load">
-      <dc:filter expr="$out_name = 'sedimentload_ls' and starts-with($facet_name, 'sedimentload')">
+      <dc:filter expr="$out_name = 'sedimentload_longitudinal_section' and starts-with($facet_name, 'sedimentload')">
         <dc:if test="dc:has-result()">
           <sediment-load>
             <dc:group expr="concat($river, ' ', dc:date-format('dd.MM.yyyy - H:mm:ss', $a_creation), ' ', $collection_name)">
@@ -1001,7 +995,7 @@
                     <dc:attribute name="description" value="${facet_description}"/>
                     <dc:attribute name="ids" value="${facet_num}-${facet_name}"/>
                     <dc:attribute name="artifact-id" value="${a_id}"/>
-                    <dc:attribute name="out" value="sedimentload_ls"/>
+                    <dc:attribute name="out" value="sedimentload_longitudinal_section"/>
                   </dc:element>
                 </dc:for-each>
               </load>
@@ -1011,8 +1005,8 @@
       </dc:filter>
     </dc:macro>
 
-    <dc:macro name="bedheight_differences">
-      <dc:filter expr="($out_name = 'bed_difference_year' or $out_name = 'bed_difference_epoch') and
+    <dc:macro name="bedheight-differences">
+      <dc:filter expr="($out_name = 'bed_difference_year_longitudinal_section' or $out_name = 'bed_difference_epoch_longitudinal_section') and
         (starts-with($facet_name, 'bedheight_difference.year') or starts-with($facet_name, 'bedheight_difference.epoch'))">
         <dc:if test="dc:has-result()">
           <bedheight_differences>
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/FlowVelocityGenerator.java	Thu Aug 08 17:36:44 2013 +0200
@@ -42,7 +42,7 @@
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class FlowVelocityGenerator
-extends      XYChartGenerator
+extends      LongitudinalSectionGenerator
 implements   FacetTypes
 {
     public enum YAXIS {
@@ -85,9 +85,6 @@
     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";
 
@@ -99,7 +96,6 @@
     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]";
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Thu Aug 08 17:36:44 2013 +0200
@@ -157,7 +157,7 @@
      * @return the default title for this chart.
      */
     @Override
-    public String getDefaultChartTitle() {
+    protected String getDefaultChartTitle() {
         return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
     }
 
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightGenerator.java	Thu Aug 08 17:36:44 2013 +0200
@@ -31,7 +31,7 @@
  * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
  */
 public class MiddleBedHeightGenerator
-extends      XYChartGenerator
+extends      LongitudinalSectionGenerator
 implements   FacetTypes
 {
     public enum YAXIS {
@@ -58,14 +58,10 @@
     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";
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixLongitudinalSectionGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixLongitudinalSectionGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixLongitudinalSectionGenerator.java	Thu Aug 08 17:36:44 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]";
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffBaseGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffBaseGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffBaseGenerator.java	Thu Aug 08 17:36:44 2013 +0200
@@ -14,11 +14,11 @@
 import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult;
 import org.dive4elements.river.jfree.Bounds;
 import org.dive4elements.river.jfree.DoubleBounds;
-import org.dive4elements.river.exports.fixings.FixChartGenerator;
+import org.dive4elements.river.exports.LongitudinalSectionGenerator;
 
 /** Base for BedDiff*Year*Generators, to avoid duplicate code of setContextBounds. */
 public abstract class BedDiffBaseGenerator
-extends FixChartGenerator
+extends LongitudinalSectionGenerator
 {
     /** The logger that is used in this generator. */
     private static Logger logger = Logger.getLogger(BedDiffBaseGenerator.class);
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDiffHeightYearGenerator.java	Thu Aug 08 17:36:44 2013 +0200
@@ -15,6 +15,7 @@
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult;
+import org.dive4elements.river.exports.LongitudinalSectionGenerator;
 import org.dive4elements.river.exports.process.BedDiffHeightYearProcessor;
 import org.dive4elements.river.exports.process.KMIndexProcessor;
 import org.dive4elements.river.exports.process.Processor;
@@ -39,11 +40,9 @@
     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]";
@@ -114,12 +113,6 @@
         return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
     }
 
-    @Override
-    protected String getDefaultXAxisLabel() {
-        return msg(I18N_XAXIS_LABEL,
-            I18N_XAXIS_LABEL_DEFAULT,
-            new Object[] { getRiverName() });
-    }
 
     @Override
     protected String getDefaultYAxisLabel(int pos) {
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceEpochGenerator.java	Thu Aug 08 17:36:44 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.fixings.FixChartGenerator;
+import org.dive4elements.river.exports.LongitudinalSectionGenerator;
 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 FixChartGenerator
+extends LongitudinalSectionGenerator
 implements FacetTypes
 {
     public enum YAXIS {
@@ -50,12 +50,10 @@
     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  =
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceYearGenerator.java	Thu Aug 08 17:36:44 2013 +0200
@@ -50,13 +50,11 @@
     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]";
@@ -173,12 +171,6 @@
         return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT);
     }
 
-    @Override
-    protected String getDefaultXAxisLabel() {
-        return msg(I18N_XAXIS_LABEL,
-                   I18N_XAXIS_LABEL_DEFAULT,
-                   new Object[] { getRiverName() });
-    }
 
     @Override
     protected String getDefaultYAxisLabel(int pos) {
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedQualityGenerator.java	Thu Aug 08 17:36:44 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.XYChartGenerator;
+import org.dive4elements.river.exports.LongitudinalSectionGenerator;
 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 XYChartGenerator implements FacetTypes {
+public class BedQualityGenerator extends LongitudinalSectionGenerator implements FacetTypes {
 
     public enum YAXIS {
         W(0), P(1), D(2);
@@ -46,13 +46,11 @@
     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]";
diff -r 70b440dc5317 -r bdbe704dd433 artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadLSGenerator.java	Thu Aug 08 17:36:44 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.XYChartGenerator;
+import org.dive4elements.river.exports.LongitudinalSectionGenerator;
 import org.dive4elements.river.jfree.Bounds;
 import org.dive4elements.river.jfree.DoubleBounds;
 import org.dive4elements.river.jfree.RiverAnnotation;
@@ -38,7 +38,7 @@
 
 /** Generator for Longitudinal Sections of SedimentLoad-Calculations. */
 public class SedimentLoadLSGenerator
-extends XYChartGenerator
+extends LongitudinalSectionGenerator
 implements FacetTypes
 {
     /** Y-Axis enum defining the four possible axes. */
@@ -58,7 +58,6 @@
     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";
@@ -69,7 +68,6 @@
 
     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]";
@@ -227,11 +225,6 @@
     }
 
     @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) {
diff -r 70b440dc5317 -r bdbe704dd433 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Aug 08 16:19:59 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.java	Thu Aug 08 17:36:44 2013 +0200
@@ -404,7 +404,7 @@
 
     String year();
 
-    String sedimentload_ls();
+    String sedimentload_longitudinal_section();
 
     // Gauges
 
@@ -486,6 +486,8 @@
 
     String w_differences();
 
+    String w_differences_longitudinal_section();
+
     String historical_discharge();
 
     String historical_discharge_wq();
@@ -562,11 +564,11 @@
 
     String discharge();
 
-    String flow_velocity();
+    String flow_velocity_longitudinal_section();
 
     String flow_velocity_export();
 
-    String bedheight_middle();
+    String bedheight_middle_longitudinal_section();
 
     String bedheight_middle_export();
 
@@ -598,11 +600,11 @@
 
     String soundings_width();
 
-    String bed_difference_year();
+    String bed_difference_year_longitudinal_section();
 
-    String bed_difference_epoch();
+    String bed_difference_epoch_longitudinal_section();
 
-    String bed_difference_height_year();
+    String bed_difference_height_year_longitudinal_section();
 
     String bedheight_difference_export();
 
diff -r 70b440dc5317 -r bdbe704dd433 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Aug 08 16:19:59 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Aug 08 17:36:44 2013 +0200
@@ -87,7 +87,7 @@
 end_year = End
 period = Period
 year = Year
-sedimentload_ls = Sediment Load
+sedimentload_longitudinal_section = Sediment Load
 welcome = Welcome to Flusshydrologische Software
 welcome_open_or_create = Please open a project from the project list or create a
 # Header images
@@ -225,9 +225,9 @@
 floodmap = Floodmap
 historical_discharge = Time-Chart
 historical_discharge_wq = W/Q-Chart
-flow_velocity = Flow Velocity
+flow_velocity_longitudinal_section = Flow Velocity
 flow_velocity_export = Flow Velocity Export
-bedheight_middle = Middle Bed Height
+bedheight_middle_longitudinal_section = Middle Bed Height
 bedheight_middle_export = Middle Bed Height Export
 bed_longitudinal_section = Bed Quality
 bed_longitudinal_section_export = Bed Quality Export
@@ -241,6 +241,7 @@
 cross_section = Cross Section
 cross_sections = Cross Sections
 w_differences = Differences
+w_differences_longitudinal_section = Differences
 w_differences_export = Differences Export
 reference_curve_export = Reference Curve Export
 historical_discharge_export = Historical Discharge Curve Export
@@ -256,9 +257,9 @@
 bed_diameter = Bed Diameter
 soundings = Soundings
 soundings_width = Soundings Width
-bed_difference_year = Bedheight Differences
-bed_difference_epoch = Epoch Bedheight Differences
-bed_difference_height_year = Bedheight Differences per year
+bed_difference_year_longitudinal_section = Bedheight Differences
+bed_difference_epoch_longitudinal_section = Epoch Bedheight Differences
+bed_difference_height_year_longitudinal_section = Bedheight Differences per year
 bedheight_difference_export = Bedheight Differences Export
 
 exportATTooltip = Export as AT file
diff -r 70b440dc5317 -r bdbe704dd433 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Aug 08 16:19:59 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Aug 08 17:36:44 2013 +0200
@@ -87,7 +87,7 @@
 end_year = Ende
 period = Zeitraum
 year = Jahr
-sedimentload_ls = Sediment Fracht
+sedimentload_longitudinal_section = Sediment Fracht
 welcome = Willkommen bei der Flusshydrologischen Software
 welcome_open_or_create = Bitte \u00f6ffnen Sie ein bestehendes Projekt aus der Projektliste oder erstellen Sie ein
 
@@ -226,9 +226,9 @@
 floodmap = \u00dcberschwemmungsfl\u00e4che
 historical_discharge = Zeit-Diagramm
 historical_discharge_wq = W/Q-Diagramm
-flow_velocity = Flie\u00dfgeschwindigkeiten
+flow_velocity_longitudinal_section = Flie\u00dfgeschwindigkeiten
 flow_velocity_export = Flie\u00dfgeschwindigkeiten Export
-bedheight_middle = Mittlere Sohlh\u00f6he
+bedheight_middle_longitudinal_section = Mittlere Sohlh\u00f6he
 bedheight_middle_export = Mittlere Sohlh\u00f6he Export
 bed_longitudinal_section = Sohlbeschaffenheit
 bed_longitudinal_section_export = Sohlbeschaffenheit Export
@@ -242,6 +242,7 @@
 cross_section = Querprofil
 cross_sections = Querprofile
 w_differences = Differenzen
+w_differences_longitudinal_section = Differenzen
 w_differences_export = Differenzen Export
 reference_curve_export = Bezugslinien Export
 historical_discharge_export = Historische Abflusskurven Export
@@ -257,9 +258,9 @@
 bed_diameter = Sohldurchmesser
 soundings = Peilungen
 soundings_width = Gepeilte Breite
-bed_difference_year = Sohlh\u00f6hendifferenz
-bed_difference_epoch = Sohlh\u00f6hendifferenz (Epoche)
-bed_difference_height_year = Sohlh\u00f6hendifferenz pro Jahr
+bed_difference_year_longitudinal_section = Sohlh\u00f6hendifferenz
+bed_difference_epoch_longitudinal_section = Sohlh\u00f6hendifferenz (Epoche)
+bed_difference_height_year_longitudinal_section = Sohlh\u00f6hendifferenz pro Jahr
 bedheight_difference_export = Sohlh\u00f6hendifferenz Export
 
 waterlevel_export = Wasserstand/Wasserspiegellagen Export
diff -r 70b440dc5317 -r bdbe704dd433 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Thu Aug 08 16:19:59 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Thu Aug 08 17:36:44 2013 +0200
@@ -87,7 +87,7 @@
 end_year = end
 period = Period
 year = Year
-sedimentload_ls = Sediment Load
+sedimentload_longitudinal_section = Sediment Load
 welcome = Welcome to Flusshydrologische Software
 welcome_open_or_create = Please open a project from the project list or create a
 
@@ -224,9 +224,9 @@
 historical_discharge = Time Chart
 historical_discharge_curves = Historical Discharge Curve
 historical_discharge_wq = W/Q Chart
-flow_velocity = Flow Velocity
+flow_velocity_longitudinal_section = Flow Velocity
 flow_velocity_export = Flow Velocity Export
-bedheight_middle = Middle Bed Height
+bedheight_middle_longitudinal_section = Middle Bed Height
 bedheight_middle_export = Middle Bed Height Export
 bed_longitudinal_section = Bed Quality
 bed_longitudinal_section_export = Bed Quality Export
@@ -240,6 +240,7 @@
 cross_section = Cross Section
 cross_sections = Cross Sections
 w_differences = Differences
+w_differences_longitudinal_section = Differences
 w_differences_export = Differences Export
 reference_curve_export = Reference Curve Export
 historical_discharge_export = Historical Discharge Curve Export
@@ -255,9 +256,9 @@
 bed_diameter = Bed Diameter
 soundings = Soundings
 soundings_width = Soundings Width
-bed_difference_year = Bedheight Differences
-bed_difference_epoch = Epoch Bedheight Differences
-bed_difference_height_year = Bedheight Difference per year
+bed_difference_year_longitudinal_section = Bedheight Differences
+bed_difference_epoch_longitudinal_section = Epoch Bedheight Differences
+bed_difference_height_year_longitudinal_section = Bedheight Difference per year
 bedheight_difference_export = Bedheight Differences Export
 
 exportATTooltip = Export as AT file