# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller@intevation.de>
# Date 1354032974 -3600
# Node ID fde87551bc4a517b30e1c7113c7f506e6dbe831e
# Parent  ef93ef4ff6b141c6680f48597378b72b04a00c61# Parent  8304f982984f5a00953d18990f53c284baecc7cc
Merged.

diff -r 8304f982984f -r fde87551bc4a flys-artifacts/doc/conf/artifacts/manualpoints.xml
--- a/flys-artifacts/doc/conf/artifacts/manualpoints.xml	Tue Nov 27 15:59:26 2012 +0100
+++ b/flys-artifacts/doc/conf/artifacts/manualpoints.xml	Tue Nov 27 17:16:14 2012 +0100
@@ -24,6 +24,8 @@
             <facet name="fix_derivate_curve.manualpoints" description="Points provided by user." />
             <facet name="extreme_wq_curve.manualpoints" description="Points provided by user." />
             <facet name="bedheight_middle.manualpoints" description="Points provided by user." />
+            <facet name="sedimentload_ls.manualpoints"/>
+            <facet name="bedheight_difference.manualpoints" />
           </facets>
         </outputmode>
       </outputmodes>
diff -r 8304f982984f -r fde87551bc4a flys-artifacts/doc/conf/artifacts/minfo.xml
--- a/flys-artifacts/doc/conf/artifacts/minfo.xml	Tue Nov 27 15:59:26 2012 +0100
+++ b/flys-artifacts/doc/conf/artifacts/minfo.xml	Tue Nov 27 17:16:14 2012 +0100
@@ -192,6 +192,7 @@
                 <outputmode name="bed_difference_height_year" 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.manualpoints" />
                         <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
                         <facet name="fix_sector_average_ls_0" description="Datacage facet"/>
                         <facet name="fix_sector_average_ls_1" description="Datacage facet"/>
@@ -204,6 +205,7 @@
                 <outputmode name="bed_difference_year" 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.manualpoints" />
                         <facet name="bedheight_difference.morph_width" description="A facet for morphologic width"/>
                         <facet name="bedheight_difference.year.height1" description="A facet for raw heights."/>
                         <facet name="bedheight_difference.year.height2" description="A facet for raw heights."/>
@@ -219,6 +221,7 @@
                 <outputmode name="bed_difference_epoch" 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" />
                         <facet name="bedheight_difference.epoch.height1" description="A facet for raw heights."/>
                         <facet name="bedheight_difference.epoch.height2" description="A facet for raw heights."/>
                         <facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
@@ -426,6 +429,7 @@
                         <facet name="sedimentload.susp_sand_bed"/>
                         <facet name="sedimentload.susp_sediment"/>
                         <facet name="sedimentload.total_load"/>
+                        <facet name="sedimentload_ls.manualpoints"/>
                         <facet name="sedimentload.total"/>
                     </facets>
                 </outputmode>
diff -r 8304f982984f -r fde87551bc4a flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Tue Nov 27 15:59:26 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java	Tue Nov 27 17:16:14 2012 +0100
@@ -125,6 +125,7 @@
         FDC("fix_derivate_curve"),
         EWQ("extreme_wq_curve"),
         BHM("bedheight_middle"),
+        SLS("sedimentload_ls"),
         HD("historical_discharge");
 
         private String chartTypeString;
diff -r 8304f982984f -r fde87551bc4a flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java	Tue Nov 27 15:59:26 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/minfo/SedimentLoadLSGenerator.java	Tue Nov 27 17:16:14 2012 +0100
@@ -142,6 +142,14 @@
                  attr,
                  visible);
         }
+        else if (FacetTypes.IS.MANUALPOINTS(name)) {
+            doPoints(
+                bundle.getData(context),
+                bundle,
+                attr,
+                visible,
+                YAXIS.L.idx);
+        }
     }
 
     @Override